summaryrefslogtreecommitdiff
path: root/six.py
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
commitf7555b717194b7c9df474b4b84329944fc7cc2a4 (patch)
tree05e0c6ed74cdfdb8b9b0774ac035e1adc53cea6c /six.py
parenta171108cd738898e08f8d09cc2a4ebe742ea764a (diff)
parent92f3fe9612c2ebf6ffdb7752dd8a26d1f6edc4b4 (diff)
downloadsix-git-f7555b717194b7c9df474b4b84329944fc7cc2a4.tar.gz
Merged in mrossini/six (pull request #55)
_winreg is added to the moves module under windows only
Diffstat (limited to 'six.py')
-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):