summaryrefslogtreecommitdiff
path: root/Lib/urllib.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-05-05 19:09:31 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2010-05-05 19:09:31 +0000
commit9545a23c7ffb35417d451d24cc3b0339627965a7 (patch)
tree5e22fd30c1c6936970b4d87ca3e91f8428c74983 /Lib/urllib.py
parenta8157183b89c08cf47c969185d40973ec21a81c5 (diff)
downloadcpython-git-9545a23c7ffb35417d451d24cc3b0339627965a7.tar.gz
In a number of places code still revers
to "sys.platform == 'mac'" and that is dead code because it refers to a platform that is no longer supported (and hasn't been supported for several releases). Fixes issue #7908 for the trunk.
Diffstat (limited to 'Lib/urllib.py')
-rw-r--r--Lib/urllib.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 652be754b6..6cb95f3db8 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -42,9 +42,7 @@ __version__ = '1.17' # XXX This version is not always updated :-(
MAXFTPCACHE = 10 # Trim the ftp cache beyond this size
# Helper for non-unix systems
-if os.name == 'mac':
- from macurl2path import url2pathname, pathname2url
-elif os.name == 'nt':
+if os.name == 'nt':
from nturl2path import url2pathname, pathname2url
elif os.name == 'riscos':
from rourl2path import url2pathname, pathname2url