2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 0468e6f..d8e3a17 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,11 @@ Changelog for Six
 
 This file lists the changes in each six version.
 
+1.5.1
+-----
+
+- Issue #51: Hack around the Django autoreloader after recent six.moves changes.
+
 1.5.0
 -----
 
diff --git a/six.py b/six.py
index 212af14..6b3b9b0 100644
--- a/six.py
+++ b/six.py
@@ -105,6 +105,13 @@ class MovedModule(_LazyDescr):
         return _import_module(self.mod)
 
     def __getattr__(self, attr):
+        # Hack around the Django autoreloader. The reloader tries to get
+        # __file__ of every module in sys.modules. This doesn't work well if
+        # this MovedModule is for an module that is unavailable on this machine
+        # (like winreg on Unix systems). Thus, we pretend __file__ doesn't exist
+        # if the module hasn't been loaded yet. See issue #51.
+        if attr == "__file__" and self.mod not in sys.modules:
+            raise AttributeError
         _module = self._resolve()
         value = getattr(_module, attr)
         setattr(self, attr, value)