fix plistlib deprecations (#5)

drop python <3.4 support

Author: infothrill

.gitignore

@@ -1,8 +1,9 @@
 *.egg
 *.egg-info
 __pycache__
+.vscode
 .coverage
 .tox
 build
 dist
-htmlcov
+htmlcov

.travis.yml

@@ -1,14 +1,6 @@
 ---
 matrix:
   include:
-    - name: "Python 2.7.14 on macOS 10.13"
-      os: osx
-      osx_image: xcode9.3
-      language: shell  # 'language: python' errors on Travis CI macOS
-      before_install:
-        - python --version
-      install: pip install tox --user
-      script: tox -e py27
     - name: "Python 3.7.5 on macOS 10.14"
       os: osx
       osx_image: xcode10.2
@@ -18,7 +10,7 @@ matrix:
       install: pip3 install tox --user
       script: tox -e py37
       env: PATH=/Users/travis/Library/Python/3.7/bin:$PATH
-    - name: "Python 3.8.3 on macOS 10.15"
+    - name: "Python 3.8 on macOS 10.15"
       os: osx
       osx_image: xcode12u
       language: shell  # 'language: python' errors on Travis CI macOS
@@ -27,3 +19,12 @@ matrix:
       install: pip3 install tox --user
       script: tox -e py38
       env: PATH=/Users/travis/Library/Python/3.8/bin:$PATH
+    - name: "Python 3.9 on macOS 10.15"
+      os: osx
+      osx_image: xcode12.2
+      language: shell  # 'language: python' errors on Travis CI macOS
+      before_install:
+        - python3 --version
+      install: pip3 install tox --user
+      script: tox -e py39
+      env: PATH=/Users/travis/Library/Python/3.9/bin:$PATH

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Release history
 ---------------
 
+0.2.0 (March 2021)
+++++++++++++++++++
+- drop python 2.x, 3.2, 3.3 support
+- fix plistlib calls (issue #4)
+
 0.1.2 (September 2020)
 ++++++++++++++++++++++
 - added tox.ini for easier testing accross interpreter versions

README.rst

@@ -108,4 +108,4 @@ or, if you want to work using the source tarball:
 Requirements
 ============
 * OS X >= 10.6
-* Python 2.7, 3.2+
+* Python 3.4+

launchd/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = 'Paul Kremer'
 __email__ = 'paul@spurious.biz'
-__version__ = '0.1.2'
+__version__ = '0.2.0'
 
 from .launchctl import jobs, LaunchdJob, load, unload
 from . import plist

launchd/plist.py

@@ -43,7 +43,7 @@ def discover_filename(label, scopes=None):
 
 def read(label, scope=None):
     with open(discover_filename(label, scope), 'rb') as f:
-        return plistlib.readPlist(f)
+        return plistlib.load(f)
 
 
 def write(label, plist, scope=USER):
@@ -57,5 +57,5 @@ def write(label, plist, scope=USER):
     '''
     fname = compute_filename(label, scope)
     with open(fname, "wb") as f:
-        plistlib.writePlist(plist, f)
+        plistlib.dump(plist, f)
     return fname

launchd/tests/cmd.py

@@ -19,16 +19,10 @@ def testlaunchctl_invalid_args(self):
         self.assertRaises(ValueError, cmd.launchctl, ['foo'])
 
     def testlaunchctl_list(self):
-        if six.PY2:
-            stdout = cmd.launchctl("list")
-        else:
-            stdout = cmd.launchctl("list").decode("utf-8")
+        stdout = cmd.launchctl("list").decode("utf-8")
         self.assertTrue(isinstance(stdout, six.string_types))
 
     def testlaunchctl_list_x(self):
         label = "com.apple.Finder"
-        if six.PY2:
-            stdout = cmd.launchctl("list", label)
-        else:
-            stdout = cmd.launchctl("list", label).decode("utf-8")
+        stdout = cmd.launchctl("list", label).decode("utf-8")
         self.assertTrue(isinstance(stdout, six.string_types))

launchd/tests/plist.py

@@ -49,6 +49,11 @@ def test_discover_filename(self):
         fname = plist.discover_filename("com.apple.kextd", plist.USER)
         self.assertEqual(None, fname)
 
+    @unittest.skipUnless(sys.platform.startswith("darwin"), "requires OS X")
+    def test_read(self):
+        result = plist.read("com.apple.kextd", plist.DAEMON_OS)
+        self.assertIsInstance(result, dict)
+
 
 class PlistToolPersistencyTest(unittest.TestCase):
     def setUp(self):

setup.py

@@ -22,22 +22,17 @@
 Natural Language :: English
 Operating System :: MacOS :: MacOS X
 Programming Language :: Python
-Programming Language :: Python :: 2.7
-Programming Language :: Python :: 3.2
-Programming Language :: Python :: 3.3
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
 Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
 Programming Language :: Python :: Implementation :: CPython
 """.splitlines() if len(line) > 0]
 
 install_requires = ["six", "pyobjc-framework-ServiceManagement"]
 
-if sys.version_info < (3, 2):
-    install_requires.append("argparse")
-
 if not 'darwin' in sys.platform:
     sys.stderr.write("Warning: The package 'launchd' can only be installed and run on OS X!" + os.linesep)
 
@@ -51,7 +46,7 @@
       author="Paul Kremer",
       author_email="@".join(("paul", "spurious.biz")),  # avoid spam,
       license="MIT License",
-      description="pythonic interface for OS X launchd",
+      description="pythonic interface for macOS launchd",
       long_description=(open('README.rst', 'r').read() + '\n\n' +
                         open('CHANGELOG.rst', 'r').read()),
       url="https://github.com/infothrill/python-launchd",

tox.ini

@@ -1,7 +1,7 @@
 # Tox (http://tox.testrun.org/)
 
 [tox]
-envlist = py27, py32, py33, py34, py35, py36, py37, py38
+envlist = py34, py35, py36, py37, py38, py39
 
 [testenv]
 commands = {envpython} setup.py test