mirror of
https://github.com/python/cpython.git
synced 2024-11-24 02:15:30 +08:00
Merged revisions 74289 via svnmerge from
svn+ssh://pythondev@www.python.org/python/branches/py3k ........ r74289 | mark.dickinson | 2009-08-02 21:08:54 +0100 (Sun, 02 Aug 2009) | 3 lines Issues #2715, #6621: Remove unused and undefined references to FSSpec from binhex module. Thanks Vincent Legoll. ........
This commit is contained in:
parent
c033942ed9
commit
34776ca432
@ -143,9 +143,6 @@ class BinHex:
|
||||
if isinstance(ofp, str):
|
||||
ofname = ofp
|
||||
ofp = io.open(ofname, 'wb')
|
||||
if os.name == 'mac':
|
||||
fss = FSSpec(ofname)
|
||||
fss.SetCreatorType('BnHq', 'TEXT')
|
||||
ofp.write(b'(This file must be converted with BinHex 4.0)\r\r:')
|
||||
hqxer = _Hqxcoderengine(ofp)
|
||||
self.ofp = _Rlecoderengine(hqxer)
|
||||
@ -446,9 +443,6 @@ def hexbin(inp, out):
|
||||
finfo = ifp.FInfo
|
||||
if not out:
|
||||
out = ifp.FName
|
||||
if os.name == 'mac':
|
||||
ofss = FSSpec(out)
|
||||
out = ofss.as_pathname()
|
||||
|
||||
ofp = io.open(out, 'wb')
|
||||
# XXXX Do translation on non-mac systems
|
||||
@ -469,11 +463,4 @@ def hexbin(inp, out):
|
||||
ofp.write(d)
|
||||
ofp.close()
|
||||
|
||||
if os.name == 'mac':
|
||||
nfinfo = ofss.GetFInfo()
|
||||
nfinfo.Creator = finfo.Creator
|
||||
nfinfo.Type = finfo.Type
|
||||
nfinfo.Flags = finfo.Flags
|
||||
ofss.SetFInfo(nfinfo)
|
||||
|
||||
ifp.close()
|
||||
|
@ -42,6 +42,8 @@ C-API
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #2715: Remove remnants of Carbon.File from binhex module.
|
||||
|
||||
- Issue #6595: The Decimal constructor now allows arbitrary Unicode
|
||||
decimal digits in input, as recommended by the standard. Previously
|
||||
it was restricted to accepting [0-9].
|
||||
|
Loading…
Reference in New Issue
Block a user