aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2022-05-07 13:53:08 -0300
committerDavid Bremner <david@tethera.net>2022-06-17 08:40:19 -0300
commitb7c31f658121a0cf92759a67e1c09951e7612b63 (patch)
treedf4e4d132ed0aa02c64204ef5a7f23070e0ef5da
parent803ac83c467e440a64fbde4628bee8673b4db01d (diff)
CLI/git: drop support for python < 3.2
Debian stable had python 3.4.2 3 releases ago (approximately 6 years ago), so attempting to keep track of the changes in python is probably no longer worthwhile. We already require python 3.5 for the python-cffi bindings (although those are not yet used in notmuch-git).
-rw-r--r--notmuch-git.py33
1 files changed, 2 insertions, 31 deletions
diff --git a/notmuch-git.py b/notmuch-git.py
index 04cdae0f..fb42e5bf 100644
--- a/notmuch-git.py
+++ b/notmuch-git.py
@@ -43,12 +43,8 @@ import subprocess as _subprocess
import sys as _sys
import tempfile as _tempfile
import textwrap as _textwrap
-try: # Python 3
- from urllib.parse import quote as _quote
- from urllib.parse import unquote as _unquote
-except ImportError: # Python 2
- from urllib import quote as _quote
- from urllib import unquote as _unquote
+from urllib.parse import quote as _quote
+from urllib.parse import unquote as _unquote
_LOG = _logging.getLogger('nmbug')
_LOG.setLevel(_logging.WARNING)
@@ -68,31 +64,6 @@ _TAG_FILE_REGEX = _re.compile(_TAG_DIRECTORY + '(?P<id>[^/]*)/(?P<tag>[^/]*)')
# magic hash for Git (git hash-object -t blob /dev/null)
_EMPTYBLOB = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
-
-try:
- getattr(_tempfile, 'TemporaryDirectory')
-except AttributeError: # Python < 3.2
- class _TemporaryDirectory(object):
- """
- Fallback context manager for Python < 3.2
-
- See PEP 343 for details on context managers [1].
-
- [1]: https://www.python.org/dev/peps/pep-0343/
- """
- def __init__(self, **kwargs):
- self.name = _tempfile.mkdtemp(**kwargs)
-
- def __enter__(self):
- return self.name
-
- def __exit__(self, type, value, traceback):
- _shutil.rmtree(self.name)
-
-
- _tempfile.TemporaryDirectory = _TemporaryDirectory
-
-
def _hex_quote(string, safe='+@=:,'):
"""
quote('abc def') -> 'abc%20def'.