mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fixed local file access for macintosh

Browse source
This commit is contained in:
Jack Jansen 1995-12-15 13:22:13 +00:00
parent 4f508ad495
commit dc3e3f69db
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/urllib.py
View file

@ -17,10 +17,25 @@
import string import string
import socket import socket
import regex import regex
import os
__version__ = '1.2' __version__ = '1.2'
# Helper for non-unix systems
if os.name == 'mac':
def _fixpath(pathname):
components = string.split(pathname, '/')
if not components[0]:
# Absolute unix path, don't start with colon
return string.join(components[1:], ':')
else:
# relative unix path, start with colon
return ':' + string.join(components, ':')
else:
def _fixpath(pathname):
return pathname
# This really consists of two pieces: # This really consists of two pieces:
# (1) a class which handles opening of all sorts of URLs # (1) a class which handles opening of all sorts of URLs
@ -223,12 +238,12 @@ class URLopener:
# Use local file # Use local file
def open_local_file(self, url): def open_local_file(self, url):
host, file = splithost(url) host, file = splithost(url)
if not host: return addinfo(open(file, 'r'), noheaders()) if not host: return addinfo(open(_fixpath(file), 'r'), noheaders())
host, port = splitport(host) host, port = splitport(host)
if not port and socket.gethostbyname(host) in ( if not port and socket.gethostbyname(host) in (
localhost(), thishost()): localhost(), thishost()):
file = unquote(file) file = unquote(file)
return addinfo(open(file, 'r'), noheaders()) return addinfo(open(_fixpath(file), 'r'), noheaders())
raise IOError, ('local file error', 'not on local host') raise IOError, ('local file error', 'not on local host')
# Use FTP protocol # Use FTP protocol