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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mac_alias
-Version: 2.0.5
+Version: 2.0.7
 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.5 → mac_alias-2.0.7}/mac_alias/alias.py

@@ -258,10 +258,10 @@ class Alias (object):
         alias = Alias()
         alias.appinfo = appinfo
             
-        alias.volume = VolumeInfo (volname.replace('/',':'),
+        alias.volume = VolumeInfo (volname.decode().replace('/',':'),
                                    voldate, fstype, disktype,
                                    volattrs, volfsid)
-        alias.target = TargetInfo (kind, filename.replace('/',':'),
+        alias.target = TargetInfo (kind, filename.decode().replace('/',':'),
                                    folder_cnid, cnid,
                                    crdate, creator_code, type_code)
         alias.target.levels_from = levels_from
@@ -276,9 +276,9 @@ class Alias (object):
                 b.read(1)
 
             if tag == TAG_CARBON_FOLDER_NAME:
-                alias.target.folder_name = value.replace('/',':')
+                alias.target.folder_name = value.decode().replace('/',':')
             elif tag == TAG_CNID_PATH:
-                alias.target.cnid_path = struct.unpack(b'>%uI' % (length // 4),
+                alias.target.cnid_path = struct.unpack('>%uI' % (length // 4),
                                                            value)
             elif tag == TAG_CARBON_PATH:
                 alias.target.carbon_path = value
@@ -313,9 +313,9 @@ class Alias (object):
                 alias.target.creation_date \
                     = mac_epoch + datetime.timedelta(seconds=seconds)
             elif tag == TAG_POSIX_PATH:
-                alias.target.posix_path = value
+                alias.target.posix_path = value.decode()
             elif tag == TAG_POSIX_PATH_TO_MOUNTPOINT:
-                alias.volume.posix_path = value
+                alias.volume.posix_path = value.decode()
             elif tag == TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE:
                 alias.volume.disk_image_alias = Alias.from_bytes(value)
             elif tag == TAG_USER_HOME_LENGTH_PREFIX:
@@ -467,12 +467,12 @@ class Alias (object):
 
         b.write(struct.pack(b'>hhQhhQ',
                 TAG_HIGH_RES_VOLUME_CREATION_DATE,
-                8, long(voldate * 65536),
+                8, int(voldate * 65536),
                 TAG_HIGH_RES_CREATION_DATE,
-                8, long(crdate * 65536)))
+                8, int(crdate * 65536)))
 
         if self.target.cnid_path:
-            cnid_path = struct.pack(b'>%uI' % len(self.target.cnid_path),
+            cnid_path = struct.pack('>%uI' % len(self.target.cnid_path),
                                     *self.target.cnid_path)
             b.write(struct.pack(b'>hh', TAG_CNID_PATH,
                                  len(cnid_path)))

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

@@ -317,6 +317,9 @@ class Bookmark (object):
         if len(data) < 16:
             raise ValueError('Not a bookmark file (too short)')
 
+        if isinstance(data, bytearray):
+            data = bytes(data)
+
         magic,size,dummy,hdrsize = struct.unpack(b'<4sIII', data[0:16])
 
         if magic != b'book':
@@ -595,9 +598,6 @@ class Bookmark (object):
 
         foldername = os.path.basename(dirname)
 
-        print(repr(path))
-        print(repr(vol_path))
-        
         rel_path = os.path.relpath(path, vol_path)
 
         # Build the path arrays
@@ -624,12 +624,6 @@ class Bookmark (object):
         volprops = Data(struct.pack(b'<QQQ', 0x81 | kCFURLVolumeSupportsPersistentIDs,
                                     0x13ef | kCFURLVolumeSupportsPersistentIDs, 0))
 
-        print(repr(name_path))
-        print(repr(cnid_path))
-        print(repr(fileprops))
-        print(repr(vol_path))
-        print(repr(vol_name))
-
         toc = {
             kBookmarkPath: name_path,
             kBookmarkCNIDPath: cnid_path,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mac-alias
-Version: 2.0.5
+Version: 2.0.7
 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.5 → mac_alias-2.0.7}/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.5',
+      version='2.0.7',
       description='Generate/parse Mac OS Alias records from Python',
       long_description=longdesc,
       author='Alastair Houghton',