Merge pull request #6 from fabiomcosta/master

threading.local instances are not iterable, #fix

django_pyvows/context.py

@@ -32,24 +32,21 @@ def start_environment(cls, settings_path):
         os.environ['DJANGO_SETTINGS_MODULE'] = settings_path
         settings_tracker.install()
 
-
     def __init__(self, parent):
         super(DjangoContext, self).__init__(parent)
         self.ignore('get_settings', 'template', 'request', 'model', 'url', 'find_in_parent',
                 'start_environment', 'port', 'host', 'get_url', 'get', 'post')
 
-
     @property
     def settings(self):
         thread = current_thread()
-        if not hasattr(thread, "settings"):
+        if not hasattr(thread, 'settings'):
             thread.settings = local()
         return thread.settings
 
     def setup(self):
         DjangoContext.start_environment(self.get_settings())
 
-
     def get_settings(self):
         if 'DJANGO_SETTINGS_MODULE' in os.environ:
             return os.environ['DJANGO_SETTINGS_MODULE']
@@ -88,6 +85,7 @@ def get_url(self, path):
         except ValueError:
             return path
 
+
 class DjangoHTTPContext(DjangoContext):
 
     def start_server(self, host=None, port=None):

django_pyvows/server.py

@@ -14,11 +14,8 @@
 from threading import Thread, local, current_thread
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 
-from pyvows import Vows
-from django.http import HttpRequest
 from django.core.handlers.wsgi import WSGIHandler
 
-from django_pyvows.assertions import Url, Model, Template
 
 class WSGIRequestHandler(BaseHTTPRequestHandler):
     """A request handler that implements WSGI dispatching."""
@@ -128,10 +125,11 @@ def make_response():
             thread = current_thread()
             if not hasattr(thread, "settings"):
                 thread.settings = local()
-                for key, value in settings.items():
+                for key, value in getattr(settings, '__dict__', settings).items():
                     setattr(thread.settings, key, value)
             while True:
                 self.handle_request()
+
         self.thr = Thread(target=make_response)
         self.thr.daemon = True
         self.thr.start()

django_pyvows/settings_manager.py

@@ -8,7 +8,6 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 Rafael Caricio rafael@caricio.com
 
-import sys
 from threading import current_thread
 
 class SettingsTracker(object):
@@ -24,7 +23,7 @@ def _import(self, name, globals=None, locals=None, fromlist=[], level=-1):
         fromlist = (fromlist or [])
         if name == 'django.conf' and 'settings' in fromlist:
             result.settings = VowsSettings(result.settings)
-        elif name == "django" and 'conf' in fromlist:
+        elif name == 'django' and 'conf' in fromlist:
             result.conf.settings = VowsSettings(result.conf.settings)
         return result
 
@@ -35,7 +34,7 @@ def __init__(self, original_settings):
 
     def __getattr__(self, attr_name):
         thread = current_thread()
-        if hasattr(thread, "settings"):
+        if hasattr(thread, 'settings'):
             if hasattr(thread.settings, attr_name):
                 return getattr(thread.settings, attr_name)
         return getattr(self.original_settings, attr_name)