[Python-checkins] cpython (merge 2.6 -> 2.7): Merge #14984: only import pwd on POSIX.

r.david.murray python-checkins at python.org
Wed Sep 18 15:00:19 CEST 2013


http://hg.python.org/cpython/rev/88e62c43e443
changeset:   85750:88e62c43e443
branch:      2.7
parent:      85747:041caa64486b
parent:      85749:fb3ad8a749c8
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Sep 18 08:50:11 2013 -0400
summary:
  Merge #14984: only import pwd on POSIX.

files:
  Lib/netrc.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/netrc.py b/Lib/netrc.py
--- a/Lib/netrc.py
+++ b/Lib/netrc.py
@@ -2,7 +2,9 @@
 
 # Module and documentation by Eric S. Raymond, 21 Dec 1998
 
-import os, stat, shlex, pwd
+import os, stat, shlex
+if os.name == 'posix':
+    import pwd
 
 __all__ = ["netrc", "NetrcParseError"]
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list