# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1330387534 28800
# Node ID b03602153de2cecf8d867631ebabbfe058204549
# Parent  24b8d06eae53d58f51a4930cee55b128b5416ae3
removing more cruft

diff -r 24b8d06eae53 -r b03602153de2 simpypi/dispatcher.py
--- a/simpypi/dispatcher.py	Mon Feb 27 15:57:01 2012 -0800
+++ b/simpypi/dispatcher.py	Mon Feb 27 16:05:34 2012 -0800
@@ -4,12 +4,10 @@
 """
 
 import os
-
 from handlers import Index
+from webob import Request, Response, exc
 
-from paste.fileapp import FileApp
-from pkg_resources import resource_filename
-from webob import Request, Response, exc
+here = os.path.dirname(os.path.abspath(__file__))
 
 class Dispatcher(object):
 
@@ -18,26 +16,30 @@
                 'template_dirs': '',
                 }
 
-    def __init__(self, **kw):
+    def __init__(self, directory, **kw):
+
+        self.directory = directory
+        assert os.path.exists(directory)
 
         # set instance parameters from kw and defaults
-        for key in self.defaults:
-            setattr(self, key, kw.get(key, self.defaults[key]))
-        self.auto_reload = self.auto_reload.lower() == 'true'
+# XXX unneeded for now
+#        for key in self.defaults:
+#            setattr(self, key, kw.get(key, self.defaults[key]))
+#        self.auto_reload = self.auto_reload.lower() == 'true'
 
         # request handlers
         self.handlers = [ Index ]
 
         # template directories
-        self.template_dirs = self.template_dirs.split()
-        self.template_dirs.append(resource_filename(__name__, 'templates'))
+#        self.template_dirs = self.template_dirs.split()
+        self.template_dirs = [os.path.join(here, 'templates')]
 
     def __call__(self, environ, start_response):
 
         # get a request object
         request = Request(environ)
 
-        # get the path 
+        # get the path
         path = request.path_info.strip('/').split('/')
         if path == ['']:
             path = []
diff -r 24b8d06eae53 -r b03602153de2 simpypi/factory.py
--- a/simpypi/factory.py	Mon Feb 27 15:57:01 2012 -0800
+++ b/simpypi/factory.py	Mon Feb 27 16:05:34 2012 -0800
@@ -25,6 +25,11 @@
     return HTTPExceptionHandler(PassthroughFileserver(app, resource_filename(__name__, 'static')))
 
 if __name__ == '__main__':
+    import shutil
     import tempfile
     from wsgiref import simple_server
-    app = factory
+    tempdir = tempfile.mkdtemp()
+    try:
+        app = factory
+    finally:
+        shutil.rmtree(tempdir)