diff options
| author | Georg Brandl <georg@python.org> | 2008-05-18 11:12:40 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-18 11:12:40 (GMT) |
| commit | c4dc0d4000939955723f59fea04c7049a6b4689d (patch) | |
| tree | 1f61e3f3d516fbc5bf5e8d3d10d72522762ae60d /Lib | |
| parent | 9087b7f83b2e2fb8eaee899a9b6d6f0646bd3aa1 (diff) | |
| download | cpython-c4dc0d4000939955723f59fea04c7049a6b4689d.zip cpython-c4dc0d4000939955723f59fea04c7049a6b4689d.tar.gz cpython-c4dc0d4000939955723f59fea04c7049a6b4689d.tar.bz2 | |
#2905: fix merge glitch on OSX.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urllib.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index f610e4b..5cdfb46 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1377,22 +1377,22 @@ if sys.platform == 'darwin': return {} - kSCPropNetProxiesHTTPEnable = sc.CFStringCreateWithCString(0, "HTTPEnable", 0) - kSCPropNetProxiesHTTPProxy = sc.CFStringCreateWithCString(0, "HTTPProxy", 0) - kSCPropNetProxiesHTTPPort = sc.CFStringCreateWithCString(0, "HTTPPort", 0) - - kSCPropNetProxiesHTTPSEnable = sc.CFStringCreateWithCString(0, "HTTPSEnable", 0) - kSCPropNetProxiesHTTPSProxy = sc.CFStringCreateWithCString(0, "HTTPSProxy", 0) - kSCPropNetProxiesHTTPSPort = sc.CFStringCreateWithCString(0, "HTTPSPort", 0) - - kSCPropNetProxiesFTPEnable = sc.CFStringCreateWithCString(0, "FTPEnable", 0) - kSCPropNetProxiesFTPPassive = sc.CFStringCreateWithCString(0, "FTPPassive", 0) - kSCPropNetProxiesFTPPort = sc.CFStringCreateWithCString(0, "FTPPort", 0) - kSCPropNetProxiesFTPProxy = sc.CFStringCreateWithCString(0, "FTPProxy", 0) - - kSCPropNetProxiesGopherEnable = sc.CFStringCreateWithCString(0, "GopherEnable", 0) - kSCPropNetProxiesGopherPort = sc.CFStringCreateWithCString(0, "GopherPort", 0) - kSCPropNetProxiesGopherProxy = sc.CFStringCreateWithCString(0, "GopherProxy", 0) + kSCPropNetProxiesHTTPEnable = sc.CFStringCreateWithCString(0, b"HTTPEnable", 0) + kSCPropNetProxiesHTTPProxy = sc.CFStringCreateWithCString(0, b"HTTPProxy", 0) + kSCPropNetProxiesHTTPPort = sc.CFStringCreateWithCString(0, b"HTTPPort", 0) + + kSCPropNetProxiesHTTPSEnable = sc.CFStringCreateWithCString(0, b"HTTPSEnable", 0) + kSCPropNetProxiesHTTPSProxy = sc.CFStringCreateWithCString(0, b"HTTPSProxy", 0) + kSCPropNetProxiesHTTPSPort = sc.CFStringCreateWithCString(0, b"HTTPSPort", 0) + + kSCPropNetProxiesFTPEnable = sc.CFStringCreateWithCString(0, b"FTPEnable", 0) + kSCPropNetProxiesFTPPassive = sc.CFStringCreateWithCString(0, b"FTPPassive", 0) + kSCPropNetProxiesFTPPort = sc.CFStringCreateWithCString(0, b"FTPPort", 0) + kSCPropNetProxiesFTPProxy = sc.CFStringCreateWithCString(0, b"FTPProxy", 0) + + kSCPropNetProxiesGopherEnable = sc.CFStringCreateWithCString(0, b"GopherEnable", 0) + kSCPropNetProxiesGopherPort = sc.CFStringCreateWithCString(0, b"GopherPort", 0) + kSCPropNetProxiesGopherProxy = sc.CFStringCreateWithCString(0, b"GopherProxy", 0) proxies = {} proxyDict = sc.SCDynamicStoreCopyProxies(None) |