Staging
v0.8.1
v0.8.1
https://github.com/python/cpython
Revision 958980190cd04b819d592dd6654df72cd1df3edd authored by Georg Brandl on 05 April 2009, 21:23:27 UTC, committed by Georg Brandl on 05 April 2009, 21:23:27 UTC
........ r70869 | georg.brandl | 2009-03-31 21:14:42 +0200 (Di, 31 Mär 2009) | 1 line Fix-up unwanted change. ........ r70883 | georg.brandl | 2009-03-31 22:41:08 +0200 (Di, 31 Mär 2009) | 1 line #1674032: return value of flag from Event.wait(). OKed by Guido. ........ r70901 | georg.brandl | 2009-03-31 23:40:24 +0200 (Di, 31 Mär 2009) | 2 lines Remove warning about pending Win9x support removal. ........ r70903 | georg.brandl | 2009-03-31 23:45:18 +0200 (Di, 31 Mär 2009) | 1 line #1676135: remove trailing slashes from --prefix argument. ........ r70951 | georg.brandl | 2009-04-01 16:02:27 +0200 (Mi, 01 Apr 2009) | 1 line Add Maksim, who worked on several issues at the sprint. ........ r70992 | georg.brandl | 2009-04-01 23:00:55 +0200 (Mi, 01 Apr 2009) | 1 line #4572: add SEEK_* values as constants in io.py. ........ r70993 | georg.brandl | 2009-04-01 23:05:44 +0200 (Mi, 01 Apr 2009) | 1 line Add NEWS item. ........ r70994 | georg.brandl | 2009-04-01 23:06:30 +0200 (Mi, 01 Apr 2009) | 1 line Revert accidental checkin. ........ r71006 | georg.brandl | 2009-04-02 01:32:17 +0200 (Do, 02 Apr 2009) | 1 line Cache the f_locals dict of the current frame, since every access to frame.f_locals overrides its contents with the real locals which undoes modifications made by the debugging user. ........ r71019 | georg.brandl | 2009-04-02 04:00:01 +0200 (Do, 02 Apr 2009) | 1 line Fix test_doctest, missed two assignments to curframe. ........ r71024 | georg.brandl | 2009-04-02 04:47:44 +0200 (Do, 02 Apr 2009) | 4 lines In PyErr_GivenExceptionMatches, temporarily bump the recursion limit, so that in the most common case PyObject_IsSubclass will not raise a recursion error we have to ignore anyway. ........
1 parent 9b08e05
Tip revision: 958980190cd04b819d592dd6654df72cd1df3edd authored by Georg Brandl on 05 April 2009, 21:23:27 UTC
Blocked revisions 70869,70883,70901,70903,70951,70992-70994,71006,71019,71024 via svnmerge
Blocked revisions 70869,70883,70901,70903,70951,70992-70994,71006,71019,71024 via svnmerge
Tip revision: 9589801
macurl2path.py
"""Macintosh-specific module for conversion between pathnames and URLs.
Do not import directly; use urllib instead."""
import urllib
import os
__all__ = ["url2pathname","pathname2url"]
def url2pathname(pathname):
"""OS-specific conversion from a relative URL of the 'file' scheme
to a file system path; not recommended for general use."""
#
# XXXX The .. handling should be fixed...
#
tp = urllib.splittype(pathname)[0]
if tp and tp != 'file':
raise RuntimeError, 'Cannot convert non-local URL to pathname'
# Turn starting /// into /, an empty hostname means current host
if pathname[:3] == '///':
pathname = pathname[2:]
elif pathname[:2] == '//':
raise RuntimeError, 'Cannot convert non-local URL to pathname'
components = pathname.split('/')
# Remove . and embedded ..
i = 0
while i < len(components):
if components[i] == '.':
del components[i]
elif components[i] == '..' and i > 0 and \
components[i-1] not in ('', '..'):
del components[i-1:i+1]
i = i-1
elif components[i] == '' and i > 0 and components[i-1] != '':
del components[i]
else:
i = i+1
if not components[0]:
# Absolute unix path, don't start with colon
rv = ':'.join(components[1:])
else:
# relative unix path, start with colon. First replace
# leading .. by empty strings (giving ::file)
i = 0
while i < len(components) and components[i] == '..':
components[i] = ''
i = i + 1
rv = ':' + ':'.join(components)
# and finally unquote slashes and other funny characters
return urllib.unquote(rv)
def pathname2url(pathname):
"""OS-specific conversion from a file system path to a relative URL
of the 'file' scheme; not recommended for general use."""
if '/' in pathname:
raise RuntimeError, "Cannot convert pathname containing slashes"
components = pathname.split(':')
# Remove empty first and/or last component
if components[0] == '':
del components[0]
if components[-1] == '':
del components[-1]
# Replace empty string ('::') by .. (will result in '/../' later)
for i in range(len(components)):
if components[i] == '':
components[i] = '..'
# Truncate names longer than 31 bytes
components = map(_pncomp2url, components)
if os.path.isabs(pathname):
return '/' + '/'.join(components)
else:
return '/'.join(components)
def _pncomp2url(component):
component = urllib.quote(component[:31], safe='') # We want to quote slashes
return component
def test():
for url in ["index.html",
"bar/index.html",
"/foo/bar/index.html",
"/foo/bar/",
"/"]:
print '%r -> %r' % (url, url2pathname(url))
for path in ["drive:",
"drive:dir:",
"drive:dir:file",
"drive:file",
"file",
":file",
":dir:",
":dir:file"]:
print '%r -> %r' % (path, pathname2url(path))
if __name__ == '__main__':
test()
Computing file changes ...