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

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

@@ -1,12 +1,25 @@
 Metadata-Version: 1.1
 Name: mac_alias
-Version: 2.0.0
+Version: 2.0.2
 Summary: Generate/parse Mac OS Alias records from Python
 Home-page: http://alastairs-place.net/projects/mac_alias
 Author: Alastair Houghton
 Author-email: alastair@alastairs-place.net
 License: MIT License
-Description: ``mac_alias`` lets you generate or read binary Alias and Bookmark records
+Description: =========
+        mac_alias
+        =========
+        
+        .. image:: https://travis-ci.org/al45tair/mac_alias.svg?branch=master
+            :target: https://travis-ci.org/al45tair/mac_alias
+        
+        .. image:: https://readthedocs.org/projects/mac_alias/badge/?version=latest
+            :target: http://mac_alias.readthedocs.io/en/latest/?badge=latest
+        
+        What is this?
+        -------------
+        
+        ``mac_alias`` lets you generate or read binary Alias and Bookmark records
         from Python code.
         
         While it is written in pure Python, some OS X specific code is required to
@@ -18,6 +31,10 @@ Description: ``mac_alias`` lets you generate or read binary Alias and Bookmark r
         <alastair@alastairs-place.net> was responsible for reverse engineering the
         bookmark format.
         
+        See the documentation_ for more information.
+        
+        .. _documentation:: http://mac-alias.rtfd.org
+        
 Platform: darwin
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License

{mac_alias-2.0.0 → mac_alias-2.0.2}/README.rst

@@ -1,3 +1,16 @@
+=========
+mac_alias
+=========
+
+.. image:: https://travis-ci.org/al45tair/mac_alias.svg?branch=master
+    :target: https://travis-ci.org/al45tair/mac_alias
+
+.. image:: https://readthedocs.org/projects/mac_alias/badge/?version=latest
+    :target: http://mac_alias.readthedocs.io/en/latest/?badge=latest
+
+What is this?
+-------------
+
 ``mac_alias`` lets you generate or read binary Alias and Bookmark records
 from Python code.
 
@@ -9,3 +22,7 @@ Credit is due to Wim Lewis <wiml@hhhh.org>, whose work on reverse engineering
 the alias format was extremely useful in writing this code.  Alastair Houghton
 <alastair@alastairs-place.net> was responsible for reverse engineering the
 bookmark format.
+
+See the documentation_ for more information.
+
+.. _documentation:: http://mac-alias.rtfd.org

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

@@ -323,6 +323,9 @@ class Alias (object):
         """Create an :class:`Alias` that points at the specified file."""
         if sys.platform != 'darwin':
             raise Exception('Not implemented (requires special support)')
+
+        if not isinstance(path, bytes):
+            path = path.encode('utf-8')
         
         a = Alias()
 
@@ -337,7 +340,7 @@ class Alias (object):
         volinfo = osx.getattrlist(vol_path, attrs, 0)
 
         vol_crtime = volinfo[0]
-        vol_name = volinfo[1]
+        vol_name = volinfo[1].encode('utf-8')
         
         # Also grab various attributes of the file
         attrs = [(osx.ATTR_CMN_OBJTYPE
@@ -357,7 +360,7 @@ class Alias (object):
         
         dirname, filename = os.path.split(path)
 
-        if dirname == '' or dirname == '.':
+        if dirname == b'' or dirname == b'.':
             dirname = os.getcwd()
 
         foldername = os.path.basename(dirname)
@@ -382,10 +385,10 @@ class Alias (object):
         rel_path = os.path.relpath(path, vol_path)
 
         # Leave off the initial '/' if vol_path is '/' (no idea why)
-        if vol_path == '/':
+        if vol_path == b'/':
             a.target.posix_path = rel_path
         else:
-            a.target.posix_path = '/' + rel_path
+            a.target.posix_path = b'/' + rel_path
 
         # Construct the Carbon and CNID paths
         carbon_path = []
@@ -398,10 +401,11 @@ class Alias (object):
                 attrs = [osx.ATTR_CMN_FILEID, 0, 0, 0, 0]
                 info = osx.getattrlist(os.path.join(vol_path, head), attrs, 0)
                 cnid_path.append(info[0])
-            carbon_tail = tail.replace(':','/')
+            carbon_tail = tail.replace(b':',b'/')
             carbon_path.insert(0, carbon_tail)
             head, tail = os.path.split(head)
-        carbon_path = vol_name + ':' + ':\0'.join(carbon_path)
+
+        carbon_path = vol_name + b':' + b':\0'.join(carbon_path)
 
         a.target.carbon_path = carbon_path
         a.target.cnid_path = cnid_path
@@ -439,7 +443,7 @@ class Alias (object):
 
         # Excuse the odd order; we're copying Finder
         if self.target.folder_name:
-            carbon_foldername = self.target.folder_name.replace(':','/')\
+            carbon_foldername = self.target.folder_name.replace(b':',b'/')\
               .encode('utf-8')
             b.write(struct.pack(b'>hh', TAG_CARBON_FOLDER_NAME,
                                 len(carbon_foldername)))

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

@@ -4,7 +4,7 @@
 #  for the old-fashioned alias format.  The details of this format were
 #  reverse engineered; some things are still not entirely clear.
 #
-from __future__ import unicode_literals
+from __future__ import unicode_literals, print_function
 
 import struct
 import uuid
@@ -13,7 +13,10 @@ import os
 import sys
 import pprint
 
-from urlparse import urljoin
+try:
+    from urlparse import urljoin
+except ImportError:
+    from urllib.parse import urljoin
 
 if sys.platform == 'darwin':
     from . import osx
@@ -292,7 +295,7 @@ class Bookmark (object):
         elif dtype == BMK_NULL:
             return None
 
-        print 'Unknown data type %08x' % typecode
+        print('Unknown data type %08x' % typecode)
         return (typecode, databytes)
 
     @classmethod
@@ -533,7 +536,7 @@ class Bookmark (object):
 
         # Find the filesystem
         st = osx.statfs(path)
-        vol_path = st.f_mntonname
+        vol_path = st.f_mntonname.decode('utf-8')
 
         # Grab its attributes
         attrs = [osx.ATTR_CMN_CRTIME,
@@ -580,6 +583,9 @@ 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
@@ -606,6 +612,12 @@ 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,
@@ -622,9 +634,9 @@ class Bookmark (object):
             kBookmarkVolumeProperties: volprops,
             kBookmarkCreationOptions: 512,
             kBookmarkWasFileReference: True,
-            kBookmarkUserName: 'alastair',
-            kBookmarkUID: 501,
-            }
+            kBookmarkUserName: 'unknown',
+            kBookmarkUID: 99,
+        }
 
         if relcount:
             toc[kBookmarkURLLengths] = url_lengths

{mac_alias-2.0.0 → mac_alias-2.0.2}/mac_alias/osx.py

@@ -434,7 +434,7 @@ def _datetime_from_timespec(ts):
     return unix_epoch + td
 
 def _decode_utf8_nul(sz):
-    nul = sz.find('\0')
+    nul = sz.find(b'\0')
     if nul > -1:
         sz = sz[:nul]
     return sz.decode('utf-8')
@@ -757,6 +757,8 @@ def _get_errno():
     return __error().contents.value
                 
 def getattrlist(path, attrs, options):
+    if not isinstance(path, bytes):
+        path = path.encode('utf-8')
     attrs = list(attrs)
     if attrs[1]:
         attrs[1] |= ATTR_VOL_INFO
@@ -805,6 +807,8 @@ def fgetattrlist(fd, attrs, options):
     return _decode_attrlist_result(buf, attrs, options)
 
 def statfs(path):
+    if not isinstance(path, bytes):
+        path = path.encode('utf-8')
     result = struct_statfs()
     ret = _statfs(path, byref(result))
     if ret < 0:

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

@@ -1,12 +1,25 @@
 Metadata-Version: 1.1
 Name: mac-alias
-Version: 2.0.0
+Version: 2.0.2
 Summary: Generate/parse Mac OS Alias records from Python
 Home-page: http://alastairs-place.net/projects/mac_alias
 Author: Alastair Houghton
 Author-email: alastair@alastairs-place.net
 License: MIT License
-Description: ``mac_alias`` lets you generate or read binary Alias and Bookmark records
+Description: =========
+        mac_alias
+        =========
+        
+        .. image:: https://travis-ci.org/al45tair/mac_alias.svg?branch=master
+            :target: https://travis-ci.org/al45tair/mac_alias
+        
+        .. image:: https://readthedocs.org/projects/mac_alias/badge/?version=latest
+            :target: http://mac_alias.readthedocs.io/en/latest/?badge=latest
+        
+        What is this?
+        -------------
+        
+        ``mac_alias`` lets you generate or read binary Alias and Bookmark records
         from Python code.
         
         While it is written in pure Python, some OS X specific code is required to
@@ -18,6 +31,10 @@ Description: ``mac_alias`` lets you generate or read binary Alias and Bookmark r
         <alastair@alastairs-place.net> was responsible for reverse engineering the
         bookmark format.
         
+        See the documentation_ for more information.
+        
+        .. _documentation:: http://mac-alias.rtfd.org
+        
 Platform: darwin
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License

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

@@ -1,11 +1,25 @@
 # -*- coding: utf-8 -*-
+import sys
 from setuptools import setup
 
-with open('README.rst', 'r') as f:
+from setuptools.command.test import test as TestCommand
+
+class PyTest(TestCommand):
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        import pytest
+        errno = pytest.main(self.test_args)
+        sys.exit(errno)
+
+with open('README.rst', 'rb') as f:
     longdesc = f.read().decode('utf-8')
 
 setup(name='mac_alias',
-      version='2.0.0',
+      version='2.0.2',
       description='Generate/parse Mac OS Alias records from Python',
       long_description=longdesc,
       author='Alastair Houghton',
@@ -19,4 +33,8 @@ setup(name='mac_alias',
           'License :: OSI Approved :: MIT License',
           'Topic :: Desktop Environment',
           'Topic :: Software Development :: Libraries :: Python Modules'],
+      tests_require=['pytest'],
+      cmdclass={
+          'test': PyTest
+          },
       provides=['mac_alias'])