summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-20 10:35:25 -0500
committerBenjamin Peterson <benjamin@python.org>2015-03-20 10:35:25 -0500
commit577ae2bffba2268e9ea1f200a82213f7035b85d1 (patch)
tree05e0c6ed74cdfdb8b9b0774ac035e1adc53cea6c
parent8e5b029f6d691efc6333abc9d97872e633b187cd (diff)
parent1bbe0edda4d7af4a05b3ca10c37b573142516342 (diff)
downloadsix-577ae2bffba2268e9ea1f200a82213f7035b85d1.tar.gz
Merged in mrossini/six (pull request #55)
_winreg is added to the moves module under windows only
-rw-r--r--six.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/six.py b/six.py
index 36b7f9d..806e3cd 100644
--- a/six.py
+++ b/six.py
@@ -298,8 +298,12 @@ _moved_attributes = [
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
- MovedModule("winreg", "_winreg"),
]
+#Add windows specific modules if needed
+if sys.platform in ('win32', 'cygwin'):
+ _moved_attributes += [
+ MovedModule("winreg", "_winreg"),
+ ]
for attr in _moved_attributes:
setattr(_MovedItems, attr.name, attr)
if isinstance(attr, MovedModule):