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.
........

diff --git a/Lib/binhex.py b/Lib/binhex.py
index 90e59bce733dc1648f668fa61208ad8175cdaa32..4b7997a7102ef64c1fa137cc7001acc7747cdf5b 100644 (file)
--- a/Lib/binhex.py
+++ b/Lib/binhex.py
@@ -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()

diff --git a/Misc/NEWS b/Misc/NEWS
index d3a67c0ecfe5f817e610c368d6116efdcff460b9..7c66a66d84dcd5e9114f33fb7daacc980e22d74f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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].