deanishe · mesozoic · Apr 20, 2022 · Apr 20, 2022 · Apr 20, 2022 · Apr 20, 2022
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -10,16 +10,21 @@ jobs:
   run:
     name: "tests & coverage"
     runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8, 3.9]
+
     env:
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 2.7
+        python-version: ${{ matrix.python-version }}
 
     - name: Install test dependencies
       run: |

diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,7 @@ osx_image: xcode8.3
 
 env:
   matrix:
-    - VERSION=2.7.10 SOURCE=macpython
-    # Turn off 2.6 as it's no longer supported
-    # - VERSION=2.6.9 SOURCE=macports
+    - VERSION=3.8.9 SOURCE=macpython
 
 before_install:
   # - brew update

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ A helper library in Python for authors of workflows for [Alfred 3 and 4][alfred]
 
 <!-- [![Downloads][shield-download]][pypi] -->
 
-Supports Alfred 3 and Alfred 4 on macOS 10.7+ (Python 2.7).
+Supports Alfred 3 and Alfred 4 on macOS Catalina or later (with Python 3).
 
 Alfred-Workflow takes the grunt work out of writing a workflow by giving you the tools to create a fast and featureful Alfred workflow from an API, application or library in minutes.
 

diff --git a/README_PYPI.rst b/README_PYPI.rst
@@ -1,7 +1,7 @@
 
 A helper library for writing `Alfred 2, 3 and 4`_ workflows.
 
-Supports macOS 10.7+ and Python 2.7 (Alfred 3 is 10.9+/2.7 only).
+Supports macOS Catalina and Python 3.7+.
 
 Alfred-Workflow is designed to take the grunt work out of writing a workflow.
 
@@ -46,7 +46,7 @@ Here's how to show recent `Pinboard.in <https://pinboard.in/>`_ posts
 in Alfred.
 
 Create a new workflow in Alfred's preferences. Add a **Script Filter** with
-Language ``/usr/bin/python`` and paste the following into the **Script**
+Language ``/usr/bin/python3`` and paste the following into the **Script**
 field (changing ``API_KEY``):
 
 

diff --git a/bin/publish-cheeseshop.sh b/bin/publish-cheeseshop.sh
@@ -7,7 +7,7 @@ rootdir=$(cd $(dirname $0)/../; pwd)
 cd "${rootdir}"
 version=$( cat workflow/version )
 
-/usr/bin/python setup.py sdist
+/usr/bin/python3 setup.py sdist
 twine upload dist/Alfred-Workflow-$version.tar.gz
 
 cd -
diff --git a/docs/api/util.rst.inc b/docs/api/util.rst.inc
@@ -36,8 +36,6 @@ Text encoding and formatting.
 
 .. autofunction:: unicodify
 
-.. autofunction:: utf8ify
-
 .. autofunction:: applescriptify
 
 

diff --git a/docs/api/web.rst.inc b/docs/api/web.rst.inc
@@ -12,27 +12,6 @@ modelled on the excellent `requests`_ library.
 The purpose of :mod:`workflow.web` is to cover trivial cases at just 0.5% of
 the size of `requests`_.
 
-.. danger::
-
-    As :mod:`workflow.web` is based on Python 2's standard HTTP libraries,
-    there are two important problems with SSL connections.
-
-    Python versions older than 2.7.9 (i.e. pre-Yosemite) **do not**
-    verify SSL certificates when establishing HTTPS connections.
-
-    As a result, you **must not** use this module for sensitive
-    connections unless you're certain it will only run on 2.7.9/Yosemite
-    and later. If your workflow is Alfred 3-only, this requirement is met.
-
-    Secondly, versions of macOS older than High Sierra (10.13) have an
-    extremely outdated version of OpenSSL, which is incompatible with
-    many servers' SSL configuration.
-
-    Consequently, :mod:`workflow.web` cannot connect to such servers.
-    As this includes GitHub's SSL configuration, the
-    :ref:`update mechanism <guide-updates>` only works on High Sierra
-    and later.
-
 
 .. autofunction:: get
 .. autofunction:: post

diff --git a/docs/api/workflow.rst.inc b/docs/api/workflow.rst.inc
@@ -58,9 +58,6 @@ The default manager (which supports JSON, pickle and cPickle) is at
 .. autoclass:: JSONSerializer
    :members:
 
-.. autoclass:: CPickleSerializer
-   :members:
-
 .. autoclass:: PickleSerializer
    :members:
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -44,7 +44,7 @@
     'sphinxcontrib.napoleon',
 ]
 
-intersphinx_mapping = {'python': ('https://docs.python.org/2.7', None)}
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -59,8 +59,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Alfred-Workflow'
-copyright = u' 2013–{} Dean Jackson'.format(date.today().year)
+project = 'Alfred-Workflow'
+copyright = ' 2013–{} Dean Jackson'.format(date.today().year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -246,8 +246,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'Alfred-Workflow.tex', u'Alfred-Workflow Documentation',
-     u'Dean Jackson <[email protected]>', 'manual'),
+    ('index', 'Alfred-Workflow.tex', 'Alfred-Workflow Documentation',
+     'Dean Jackson <[email protected]>', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -276,8 +276,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'alfred-workflow', u'Alfred-Workflow Documentation',
-     [u'Dean Jackson <[email protected]>'], 1)
+    ('index', 'alfred-workflow', 'Alfred-Workflow Documentation',
+     ['Dean Jackson <[email protected]>'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -290,8 +290,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Alfred-Workflow', u'Alfred-Workflow Documentation',
-     u'Dean Jackson <[email protected]>',
+    ('index', 'Alfred-Workflow', 'Alfred-Workflow Documentation',
+     'Dean Jackson <[email protected]>',
      'Alfred-Workflow',
      'Python helper library for Alfred Workflows',
      'Miscellaneous'),
@@ -313,10 +313,10 @@
 # -- Options for Epub output ----------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'Alfred-Workflow'
-epub_author = u'Dean Jackson <[email protected]>'
-epub_publisher = u'Dean Jackson <[email protected]>'
-epub_copyright = u'2014, Dean Jackson <[email protected]>'
+epub_title = 'Alfred-Workflow'
+epub_author = 'Dean Jackson <[email protected]>'
+epub_publisher = 'Dean Jackson <[email protected]>'
+epub_copyright = '2014, Dean Jackson <[email protected]>'
 
 # The basename for the epub file. It defaults to the project name.
 # epub_basename = u'Alfred-Workflow'

diff --git a/docs/guide/background.rst b/docs/guide/background.rst
@@ -39,7 +39,7 @@ background). What we're doing is:
         # Is cache over 1 hour old or non-existent?
         if not wf.cached_data_fresh('exchange-rates', 3600):
             run_in_background('update',
-                              ['/usr/bin/python',
+                              ['/usr/bin/python3',
                                wf.workflowfile('update_exchange_rates.py')])
 
         if is_running('update'):

diff --git a/docs/guide/magic-arguments.rst b/docs/guide/magic-arguments.rst
@@ -95,7 +95,7 @@ The magic arguments are defined in the :attr:`Workflow.magic_arguments <workflow
 The dictionary keys are the keywords for the arguments (without the
 prefix) and the values are functions that should be called when the magic
 argument is entered. You can show a message in Alfred by returning a
-``unicode`` string from the function.
+``str`` string from the function.
 
 To add a new magic argument that opens the workflow's settings file, you
 could do:

diff --git a/docs/guide/serialization.rst b/docs/guide/serialization.rst
@@ -66,11 +66,8 @@ Built-in serializers
 
 There are 3 built-in, pre-configured serializers:
 
-- :class:`cpickle <workflow.workflow.CPickleSerializer>` — the default serializer
-  for both cached and stored data, with very good support for native Python
-  data types;
-- :class:`pickle <workflow.workflow.PickleSerializer>` — a more flexible, but
-  much slower alternative to ``cpickle``; and
+- :class:`cpickle <workflow.workflow.PickleSerializer>` — the default serializer
+  for both cached and stored data, with support for native Python data types;
 - :class:`json <workflow.workflow.JSONSerializer>` — a very common data format,
   but with limited support for native Python data types.
 

diff --git a/docs/guide/setup.rst b/docs/guide/setup.rst
@@ -20,7 +20,7 @@ following (and only the following) **Escaping** options:
 
 The **Script** field should contain the following::
 
-    /usr/bin/python yourscript.py "{query}"
+    /usr/bin/python3 yourscript.py "{query}"
 
 
 where ``yourscript.py`` is the name of your script [#]_.
@@ -31,7 +31,7 @@ to capture any errors thrown by your scripts:
 .. code-block:: python
     :linenos:
 
-    #!/usr/bin/python
+    #!/usr/bin/python3
     # encoding: utf-8
 
     import sys
@@ -68,6 +68,6 @@ to capture any errors thrown by your scripts:
         sys.exit(wf.run(main))
 
 
-.. [#] It's better to specify ``/usr/bin/python`` over just ``python``. This
+.. [#] It's better to specify ``/usr/bin/python3`` over just ``python``. This
        ensures that the script will always be run with the system default
-       Python regardless of what ``PATH`` might be.
+       Python regardless of what ``PATH`` might be.
diff --git a/docs/guide/text-encoding.rst b/docs/guide/text-encoding.rst
@@ -119,7 +119,7 @@ than a concrete implementation), while encoded strings are binary data that are
 encoded according to some scheme that maps characters to a specific binary
 representation (e.g. UTF-8 or ASCII).
 
-In Python, these have the types ``unicode`` and ``str`` respectively.
+In Python, these have the types ``str`` and ``bytes`` respectively.
 
 As noted, Unicode strings only exist within a running program. Any text stored
 on disk, passed into or out of a program or transmitted over a network *must*
@@ -351,7 +351,7 @@ an empty environment. This tells Python (and other POSIX software) by omission
 that encoding is ASCII.
 
 Although this won't affect Python 2's auto-promotion of encoded strings
-(``str`` objects) to Unicode (it always uses ASCII), it *does*
+(``bytes`` objects) to Unicode (it always uses ASCII), it *does*
 affect the printing of Unicode strings, so using :func:`print` may work
 perfectly in your shell where the environmental encoding is UTF-8 but not in
 Alfred 2, where encoding is ASCII by default.

diff --git a/docs/guide/variables.rst b/docs/guide/variables.rst
@@ -190,7 +190,7 @@ read:
 
 .. code-block:: bash
 
-    /usr/bin/python myscript.py pages
+    /usr/bin/python3 myscript.py pages
 
 
 The other options (``--view``, ``--edit``, ``--share``) are set via the

diff --git a/docs/index.rst b/docs/index.rst
@@ -18,7 +18,7 @@ elsewhere, filter them and display results to the user. Alfred-Workflow takes
 care of a lot of the details for you, allowing you to concentrate your efforts
 on your workflow's functionality.
 
-Alfred-Workflow supports macOS 10.7+ (Python 2.7).
+Alfred-Workflow supports macOS Catalina or later.
 
 
 Features
@@ -58,7 +58,7 @@ Quick example
 Here's how to show recent `Pinboard.in <https://pinboard.in/>`_ posts in Alfred.
 
 Create a new workflow in Alfred's preferences. Add a **Script Filter** with
-Language ``/usr/bin/python`` and paste the following into the **Script**
+Language ``/usr/bin/python3`` and paste the following into the **Script**
 box (changing ``API_KEY``):
 
 .. code-block:: python

diff --git a/docs/supported-versions.rst b/docs/supported-versions.rst
@@ -5,8 +5,8 @@
 Supported versions
 ==================
 
-Alfred-Workflow supports all versions of Alfred 2–4. It works with
-Python 2.6 and 2.7, but *not yet* Python 3.
+Alfred-Workflow supports all versions of Alfred 2–4. It works with Python 3.8
+and does not support Python 2 any longer.
 
 Some features are not available on older versions of macOS.
 
@@ -51,48 +51,15 @@ Alfred-Workflow supports the same macOS versions as Alfred, namely 10.6 (Snow Le
 Python versions
 ===============
 
-Alfred-Workflow only officially supports the system Pythons that come with macOS (i.e. ``/usr/bin/python``), which is 2.6 on 10.6/Snow Leopard and 2.7 on later versions.
+Alfred-Workflow only officially supports the system Pythons that come with macOS (i.e. ``/usr/bin/python3``).
 
 .. important::
 
     Other Pythons (e.g. Homebrew, conda, pyenv etc.) are *not* supported.
 
     This is a deliberate design choice, so please do not submit feature requests for support of, or bug reports concerning issues with any non-system Pythons.
 
-    **This includes Python 3**.
 
-    Python 3 support will be added in a new major version of the library when Catalina is more popular.
-
-
-Here is the `full list of new features in Python 2.7`_, but the most important things if you want your workflow to run on Snow Leopard/Python 2.6 are:
-
-- :mod:`argparse` is not available in 2.6. Use :mod:`getopt` or
-  `include argparse in your workflow`_. Personally, I'm a big fan of
-  `docopt`_ for parsing command-line arguments, but :mod:`argparse`
-  is better for certain use cases.
-- You must specify field numbers for :meth:`str.format`, i.e.
-  ``'{0}.{1}'.format(first, second)`` not just
-  ``'{}.{}'.format(first, second)``.
-- No :class:`~collections.Counter` or
-  :class:`~collections.OrderedDict` in :mod:`collections`.
-- No dictionary views in 2.6.
-- No set literals.
-- No dictionary or set comprehensions.
-
-Python 2.6 is still included in later versions of macOS (up to and including El Capitan), so run your Python scripts with ``/usr/bin/python2.6`` in addition to ``/usr/bin/python`` (2.7) to make sure they will run on Snow Leopard.
-
-
-Why no Python 3 support?
-------------------------
-
-Alfred-Workflow is targeted at the system Python on macOS. Its goal is to enable developers to build workflows that will "just work" for users on any vanilla installation of macOS since Snow Leopard.
-
-As such, it :ref:`strongly discourages developers <thirdparty>` from requiring users of their workflows to bugger about with their OS in order to get a workflow to work. This naturally includes requiring the installation of some non-default Python.
-
-Version 2 of Alfred-Workflow, which will be a complete rewrite, will support Python 3 and Alfred 4+ only.
-
-
-.. _full list of new features in Python 2.7: https://docs.python.org/3/whatsnew/2.7.html
 .. _include argparse in your workflow: https://pypi.python.org/pypi/argparse
 .. _docopt: http://docopt.org/
 .. _Powerpack: https://buy.alfredapp.com/
diff --git a/docs/tutorial_1.rst b/docs/tutorial_1.rst
@@ -79,7 +79,7 @@ argument.
 
 .. note::
 
-    You *can* choose ``/usr/bin/python`` as the **Language** and paste
+    You *can* choose ``/usr/bin/python3`` as the **Language** and paste
     your Python code into the **Script** box, but this isn't the best idea.
 
     If you do this, you can't run the script from the Terminal (which can be
@@ -615,4 +615,4 @@ To learn more about coding in Python, try these resources:
        `TextMate <https://github.com/textmate/textmate/releases>`_ is an
        excellent and free editor.
        `TextWrangler <http://www.barebones.com/products/textwrangler/>`_ is
-       another good, free editor for macOS (supports 10.6).
+       another good, free editor for macOS (supports 10.6).
diff --git a/docs/tutorial_2.rst b/docs/tutorial_2.rst
@@ -892,7 +892,7 @@ update itself:
 
         # Start update script if cached data are too old (or doesn't exist)
         if not wf.cached_data_fresh('posts', max_age=600):
-            cmd = ['/usr/bin/python', wf.workflowfile('update.py')]
+            cmd = ['/usr/bin/python3', wf.workflowfile('update.py')]
             run_in_background('update', cmd)
 
         # Notify the user if the cache is being updated
@@ -1062,4 +1062,4 @@ enable your workflow to update itself from GitHub.
 .. _GitHub releases: https://help.github.com/articles/about-releases
 
 .. [#] :mod:`argparse` isn't available in Python 2.6, so this workflow won't
-       run on Snow Leopard (10.6).
+       run on Snow Leopard (10.6).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,8 +36,6 @@ Text encoding and formatting.

		.. autofunction:: unicodify

		.. autofunction:: utf8ify

		.. autofunction:: applescriptify


Expand Down