[Python-checkins] r74290 - in python/branches/release31-maint: Lib/binhex.py Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Sun Aug  2 22:09:59 2009
New Revision: 74290

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/binhex.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/binhex.py
==============================================================================
--- python/branches/release31-maint/Lib/binhex.py	(original)
+++ python/branches/release31-maint/Lib/binhex.py	Sun Aug  2 22:09:59 2009
@@ -143,9 +143,6 @@
         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 @@
     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 @@
             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()

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Aug  2 22:09:59 2009
@@ -42,6 +42,8 @@
 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].