summaryrefslogtreecommitdiff
path: root/six.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-20 10:27:28 -0500
committerBenjamin Peterson <benjamin@python.org>2015-03-20 10:27:28 -0500
commit4f078146bdc21b99819ad3df0dfbd0a923e53d00 (patch)
treeb9634e5fcfbc789b0785950bdf8a81d1f01806e1 /six.py
parentb4731b67a14d213cdbf73eade1412a60b64bd911 (diff)
parenta41bf1f9e8f8d703181e8373d4ed4db24dd8fe93 (diff)
downloadsix-git-4f078146bdc21b99819ad3df0dfbd0a923e53d00.tar.gz
Merged in maxgrenderjones/six (pull request #60)
Fixes #108 (os.getcwd has been renamed in move from 2 to 3)
Diffstat (limited to 'six.py')
-rw-r--r--six.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/six.py b/six.py
index 618c641..36b7f9d 100644
--- a/six.py
+++ b/six.py
@@ -239,6 +239,8 @@ _moved_attributes = [
MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
MovedAttribute("intern", "__builtin__", "sys"),
MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+ MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
+ MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
MovedAttribute("reduce", "__builtin__", "functools"),