mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
28 lines
953 B
Diff
28 lines
953 B
Diff
# HG changeset patch
|
|
# User Benjamin Peterson <benjamin@python.org>
|
|
# Date 1426865725 18000
|
|
# Node ID c996ed1dc0064f45e691f1664d06001ae07fff00
|
|
# Parent 7638872a6c760448ed8648d692c8eb702a29c361
|
|
# Parent 24dc6a6f7384712152dd1e881c115fb4805be9ea
|
|
Merged in mrossini/six (pull request #55)
|
|
|
|
_winreg is added to the moves module under windows only
|
|
|
|
diff --git a/six.py b/six.py
|
|
--- a/six.py
|
|
+++ b/six.py
|
|
@@ -298,8 +298,12 @@
|
|
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):
|