[*] Fixed Python 2.7 support

Author: SamuelMarks

README.md

@@ -10,11 +10,11 @@ Commands for modifying and controlling nginx over the command-line.
 
 ## Install dependencies
 
-    pip install -r requirements.txt
+    python -m pip install -r requirements.txt
 
 ## Install package
 
-    pip install .
+    python -m pip install .
 
 ## Usage
 
@@ -62,8 +62,8 @@ Commands for modifying and controlling nginx over the command-line.
                   --server_name 'localhost' --listen '8080' \
                   -b location '/' \
                     --root '/tmp/wwwroot' \
-                  -} \
-                -}
+                  -'}' \
+                -'}'
     nginx is running. Stop with: /usr/local/bin/nginx -c /tmp/nginx.conf -s stop
     $ curl -Is http://localhost:8080 | head -n1
     127.0.0.1 - - [03/Apr/2020:01:21:45 +1100] "HEAD / HTTP/1.1" 200 0 "-" "curl/7.64.1"

nginxctl/__init__.py

@@ -8,7 +8,7 @@
 import yaml
 
 __author__ = "Samuel Marks"
-__version__ = "0.0.12-alpha"
+__version__ = "0.0.12-beta"
 
 
 def get_logger(name=None):

nginxctl/__main__.py

@@ -8,13 +8,17 @@
 from enum import Enum
 from itertools import chain
 from operator import itemgetter
-from shutil import which
+if sys.version_info[0] == 2:
+  from whichcraft import which
+  from itertools import ifilter as filter
+else:
+  from shutil import which
 from subprocess import Popen
 
 import crossplane
 
 from nginxctl import __version__, get_logger
-from nginxctl.helpers import strings, unquoted_str
+from nginxctl.helpers import strings, unquoted_str, rpartial
 
 if sys.version[0] == "2":
     from tempfile import mkdtemp as gettemp
@@ -67,7 +71,7 @@ def _build_parser():
         default_nginx_usage = next(
             line for line in strings(default_nginx) if "set prefix path" in line
         ).split()
-        default_conf = next(filter(lambda s: s.endswith('nginx.conf)'), default_nginx_usage))[:-1]
+        default_conf = next(filter(rpartial(str.endswith, 'nginx.conf)'), default_nginx_usage))[:-1]
         default_prefix = os.path.dirname(default_conf)
 
     parser = ArgumentParser(

nginxctl/helpers.py

@@ -3,12 +3,18 @@
 from string import printable
 from sys import version_info
 
+if version_info[0] == 2:
+    from codecs import open
+    from string import maketrans
+else:
+    maketrans = str.maketrans
+
 string_types = (basestring,) if version_info.major == 2 else (str,)  # noqa: F821
 pp = PrettyPrinter(indent=4).pprint
 
 
 def unquoted_str(arg):
-    return arg.translate(str.maketrans(dict.fromkeys("'\"", "")))
+    return arg.translate(maketrans(dict.fromkeys("'\"", "")))
 
 
 def update_d(d, arg=None, **kwargs):
@@ -106,6 +112,8 @@ def get_dict_by_key_val(obj, key, value):
             "get_dict_by_key_val for {!r} {}".format(type(obj), obj)
         )
 
+def rpartial(func, *args):
+    return lambda *a: func(*(a + args))
 
 def strings(filename, minimum=4):
     with open(filename, errors="ignore") as f:

nginxctl/pkg_utils.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+
 import ast
 import csv
 import inspect

requirements.txt

@@ -1,4 +1,6 @@
 crossplane
 boltons
-pyyaml!=6.0.0,!=5.4.0,!=5.4.1
+enum34; python_version <= '2.7'
+whichcraft; python_version <= '2.7'
 meta
+pyyaml!=6.0.0,!=5.4.0,!=5.4.1

setup.py

@@ -67,29 +67,40 @@ def to_funcs(*paths):
         name=package_name,
         author=__author__,
         version=__version__,
-        install_requires=["pyyaml"],
+        install_requires=["crossplane", "boltons", "meta", "pyyaml!=6.0.0,!=5.4.0,!=5.4.1"],
         test_suite=package_name + ".tests",
         packages=find_packages(),
         package_dir={package_name: package_name},
         classifiers=[
             "Development Status :: 3 - Alpha",
             "Environment :: Console",
             "Intended Audience :: Developers",
-            "License :: OSI Approved",
+            "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
             "License :: OSI Approved :: Apache Software License",
             "License :: OSI Approved :: MIT License",
+            "License :: OSI Approved",
             "Natural Language :: English",
             "Operating System :: OS Independent",
+            "Programming Language :: Python :: Implementation",
             "Programming Language :: Python :: 2.7",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: Implementation",
+            "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 :: 3.10",
+            "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12",
+            "Programming Language :: Python :: 3.13",
+            "Topic :: Internet :: Proxy Servers"
+            "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
             "Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator",
-            "Topic :: Software Development",
             "Topic :: Software Development :: Build Tools",
             "Topic :: Software Development :: Code Generators",
             "Topic :: Software Development :: Compilers",
             "Topic :: Software Development :: Pre-processors",
-            "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+            "Topic :: Software Development",
         ],
         data_files=[
             (_data_install_dir(), list(map(_data_join, listdir(_data_join())))),