Index: dist/src/Lib/binhex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/binhex.py,v
retrieving revision 1.24
diff -u -r1.24 binhex.py
--- dist/src/Lib/binhex.py	7 Jun 2004 03:45:56 -0000	1.24
+++ dist/src/Lib/binhex.py	15 Jun 2005 01:20:00 -0000
@@ -44,20 +44,12 @@
 
 #
 # Workarounds for non-mac machines.
-if os.name == 'mac':
-    import macfs
-    import MacOS
-    try:
-        openrf = MacOS.openrf
-    except AttributeError:
-        # Backward compatibility
-        openrf = open
-
-    def FInfo():
-        return macfs.FInfo()
+try:
+    from Carbon.File import FSSpec, FInfo
+    from MacOS import openrf
 
     def getfileinfo(name):
-        finfo = macfs.FSSpec(name).GetFInfo()
+        finfo = FSSpec(name).FSpGetFInfo()
         dir, file = os.path.split(name)
         # XXXX Get resource/data sizes
         fp = open(name, 'rb')
@@ -75,7 +67,7 @@
             mode = '*' + mode[0]
         return openrf(name, mode)
 
-else:
+except ImportError:
     #
     # Glue code for non-macintosh usage
     #
@@ -183,7 +175,7 @@
             ofname = ofp
             ofp = open(ofname, 'w')
             if os.name == 'mac':
-                fss = macfs.FSSpec(ofname)
+                fss = FSSpec(ofname)
                 fss.SetCreatorType('BnHq', 'TEXT')
         ofp.write('(This file must be converted with BinHex 4.0)\n\n:')
         hqxer = _Hqxcoderengine(ofp)
@@ -228,7 +220,7 @@
 
     def close_data(self):
         if self.dlen != 0:
-            raise Error, 'Incorrect data size, diff=%r' % (self.rlen,)
+            raise Error, 'Incorrect data size, diff='+`self.rlen`
         self._writecrc()
         self.state = _DID_DATA
 
@@ -247,7 +239,7 @@
             raise Error, 'Close at the wrong time'
         if self.rlen != 0:
             raise Error, \
-                  "Incorrect resource-datasize, diff=%r" % (self.rlen,)
+                  "Incorrect resource-datasize, diff="+`self.rlen`
         self._writecrc()
         self.ofp.close()
         self.state = None
@@ -482,7 +474,7 @@
     if not out:
         out = ifp.FName
     if os.name == 'mac':
-        ofss = macfs.FSSpec(out)
+        ofss = FSSpec(out)
         out = ofss.as_pathname()
 
     ofp = open(out, 'wb')
@@ -515,6 +507,7 @@
 
 def _test():
     if os.name == 'mac':
+        import macfs
         fss, ok = macfs.PromptGetFile('File to convert:')
         if not ok:
             sys.exit(0)