mac-alias 2.0.2__tar.gz → 2.0.5__tar.gz

{mac_alias-2.0.2 → mac_alias-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mac_alias
-Version: 2.0.2
+Version: 2.0.5
 Summary: Generate/parse Mac OS Alias records from Python
 Home-page: http://alastairs-place.net/projects/mac_alias
 Author: Alastair Houghton

{mac_alias-2.0.2 → mac_alias-2.0.5}/mac_alias/alias.py

@@ -14,6 +14,11 @@ import sys
 if sys.platform == 'darwin':
     from . import osx
 
+try:
+    long
+except NameError:
+    long = int
+
 from .utils import *
     
 ALIAS_KIND_FILE = 0
@@ -30,6 +35,16 @@ ALIAS_EJECTABLE_DISK = 5
 
 ALIAS_NO_CNID = 0xffffffff
 
+def encode_utf8(s):
+    if isinstance(s, bytes):
+        return s
+    return s.encode('utf-8')
+
+def decode_utf8(s):
+    if isinstance(s, bytes):
+        return s.decode('utf-8')
+    return s
+
 class AppleShareInfo (object):
     def __init__(self, zone=None, server=None, user=None):
         #: The AppleShare zone
@@ -324,8 +339,7 @@ class Alias (object):
         if sys.platform != 'darwin':
             raise Exception('Not implemented (requires special support)')
 
-        if not isinstance(path, bytes):
-            path = path.encode('utf-8')
+        path = encode_utf8(path)
         
         a = Alias()
 
@@ -340,7 +354,7 @@ class Alias (object):
         volinfo = osx.getattrlist(vol_path, attrs, 0)
 
         vol_crtime = volinfo[0]
-        vol_name = volinfo[1].encode('utf-8')
+        vol_name = encode_utf8(volinfo[1])
         
         # Also grab various attributes of the file
         attrs = [(osx.ATTR_CMN_OBJTYPE
@@ -417,8 +431,8 @@ class Alias (object):
         pos = b.tell()
         b.write(struct.pack(b'>4shh', self.appinfo, 0, self.version))
 
-        carbon_volname = self.volume.name.replace(':','/').encode('utf-8')
-        carbon_filename = self.target.filename.replace(':','/').encode('utf-8')
+        carbon_volname = encode_utf8(self.volume.name).replace(b':',b'/')
+        carbon_filename = encode_utf8(self.target.filename).replace(b':',b'/')
         voldate = (self.volume.creation_date - mac_epoch).total_seconds()
         crdate = (self.target.creation_date - mac_epoch).total_seconds()
 
@@ -426,13 +440,13 @@ class Alias (object):
         #       (so doing so is ridiculous, and nothing could rely on it).
         b.write(struct.pack(b'>h28pI2shI64pII4s4shhI2s10s',
                             self.target.kind,
-                            carbon_volname, voldate,
+                            carbon_volname, int(voldate),
                             self.volume.fs_type,
                             self.volume.disk_type,
                             self.target.folder_cnid,
                             carbon_filename,
                             self.target.cnid,
-                            crdate,
+                            int(crdate),
                             self.target.creator_code,
                             self.target.type_code,
                             self.target.levels_from,
@@ -443,8 +457,8 @@ class Alias (object):
 
         # Excuse the odd order; we're copying Finder
         if self.target.folder_name:
-            carbon_foldername = self.target.folder_name.replace(b':',b'/')\
-              .encode('utf-8')
+            carbon_foldername = encode_utf8(self.target.folder_name)\
+                                .replace(b':',b'/')
             b.write(struct.pack(b'>hh', TAG_CARBON_FOLDER_NAME,
                                 len(carbon_foldername)))
             b.write(carbon_foldername)
@@ -465,7 +479,7 @@ class Alias (object):
             b.write(cnid_path)
 
         if self.target.carbon_path:
-            carbon_path=self.target.carbon_path.encode('utf-8')
+            carbon_path=encode_utf8(self.target.carbon_path)
             b.write(struct.pack(b'>hh', TAG_CARBON_PATH,
                                  len(carbon_path)))
             b.write(carbon_path)
@@ -494,7 +508,7 @@ class Alias (object):
                     b.write(b'\0')
 
         if self.volume.driver_name:
-            driver_name = self.volume.driver_name.encode('utf-8')
+            driver_name = encode_utf8(self.volume.driver_name)
             b.write(struct.pack(b'>hh', TAG_DRIVER_NAME,
                                 len(driver_name)))
             b.write(driver_name)
@@ -515,20 +529,22 @@ class Alias (object):
             if len(self.volume.network_mount_info) & 1:
                 b.write(b'\0')
 
-        utf16 = self.target.filename.replace(':','/').encode('utf-16-be')
+        utf16 = decode_utf8(self.target.filename)\
+                .replace(':','/').encode('utf-16-be')
         b.write(struct.pack(b'>hhh', TAG_UNICODE_FILENAME,
                             len(utf16) + 2,
                             len(utf16) // 2))
         b.write(utf16)
 
-        utf16 = self.volume.name.replace(':','/').encode('utf-16-be')
+        utf16 = decode_utf8(self.volume.name)\
+                .replace(':','/').encode('utf-16-be')
         b.write(struct.pack(b'>hhh', TAG_UNICODE_VOLUME_NAME,
                             len(utf16) + 2,
                             len(utf16) // 2))
         b.write(utf16)
 
         if self.target.posix_path:
-            posix_path = self.target.posix_path.encode('utf-8')
+            posix_path = encode_utf8(self.target.posix_path)
             b.write(struct.pack(b'>hh', TAG_POSIX_PATH,
                                 len(posix_path)))
             b.write(posix_path)
@@ -536,7 +552,7 @@ class Alias (object):
                 b.write(b'\0')
 
         if self.volume.posix_path:
-            posix_path = self.volume.posix_path.encode('utf-8')
+            posix_path = encode_utf8(self.volume.posix_path)
             b.write(struct.pack(b'>hh', TAG_POSIX_PATH_TO_MOUNTPOINT,
                                 len(posix_path)))
             b.write(posix_path)

{mac_alias-2.0.2 → mac_alias-2.0.5}/mac_alias/bookmark.py

@@ -21,6 +21,18 @@ except ImportError:
 if sys.platform == 'darwin':
     from . import osx
 
+def iteritems(x):
+    return x.iteritems()
+
+try:
+    unicode
+except NameError:
+    unicode = str
+    long = int
+    xrange = range
+    def iteritems(x):
+        return x.items()
+
 from .utils import *
 
 BMK_DATA_TYPE_MASK    = 0xffffff00
@@ -307,8 +319,8 @@ class Bookmark (object):
 
         magic,size,dummy,hdrsize = struct.unpack(b'<4sIII', data[0:16])
 
-        if magic != 'book':
-            raise ValueError('Not a bookmark file (bad magic)')
+        if magic != b'book':
+            raise ValueError('Not a bookmark file (bad magic) %r' % magic)
 
         if hdrsize < 16:
             raise ValueError('Not a bookmark file (header size too short)')
@@ -445,7 +457,7 @@ class Bookmark (object):
             ioffset = offset + 8 + len(item) * 8
             result = [struct.pack(b'<II', len(item) * 8, BMK_DICT | BMK_ST_ONE)]
             enc = []
-            for k,v in item.iteritems():
+            for k,v in iteritems(item):
                 result.append(struct.pack(b'<I', ioffset))
                 ioffset, ienc = cls._encode_item(k, ioffset)
                 enc.append(ienc)
@@ -479,8 +491,8 @@ class Bookmark (object):
         for tid,toc in self.tocs:
             entries = []
 
-            for k,v in toc.iteritems():
-                if isinstance(k, basestring):
+            for k,v in iteritems(toc):
+                if isinstance(k, (str, unicode)):
                     noffset = offset
                     voffset, enc = self._encode_item(k, offset)
                     result.append(enc)
@@ -496,7 +508,7 @@ class Bookmark (object):
             # binary search to find data
             entries.sort()
 
-            tocs.append((tid, b''.join([struct.pack('<III',k,o,0)
+            tocs.append((tid, b''.join([struct.pack(b'<III',k,o,0)
                                         for k,o in entries])))
 
         first_toc_offset = offset
@@ -513,7 +525,7 @@ class Bookmark (object):
                                       0xfffffffe,
                                       tid,
                                       next_offset,
-                                      len(data) / 12))
+                                      len(data) // 12))
             result.append(data)
 
             offset += 20 + len(data)
@@ -647,8 +659,8 @@ class Bookmark (object):
         result = ['Bookmark([']
         for tid,toc in self.tocs:
             result.append('(0x%x, {\n' % tid)
-            for k,v in toc.iteritems():
-                if isinstance(k, basestring):
+            for k,v in iteritems(toc):
+                if isinstance(k, (str, unicode)):
                     kf = repr(k)
                 else:
                     kf = '0x%04x' % k

{mac_alias-2.0.2 → mac_alias-2.0.5}/mac_alias.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mac-alias
-Version: 2.0.2
+Version: 2.0.5
 Summary: Generate/parse Mac OS Alias records from Python
 Home-page: http://alastairs-place.net/projects/mac_alias
 Author: Alastair Houghton

{mac_alias-2.0.2 → mac_alias-2.0.5}/setup.py

@@ -19,7 +19,7 @@ with open('README.rst', 'rb') as f:
     longdesc = f.read().decode('utf-8')
 
 setup(name='mac_alias',
-      version='2.0.2',
+      version='2.0.5',
       description='Generate/parse Mac OS Alias records from Python',
       long_description=longdesc,
       author='Alastair Houghton',