Few changes to be python 2.7 compatible

- Fixed a typo in MANIFEST.in as well
- Moved coverage config out of tox.ini and into .coveragerc

.coveragerc

@@ -0,0 +1,10 @@
+[report]
+show_missing = True
+skip_covered = True
+precision = 2
+exclude_lines =
+    # Ignore unreachable code
+    if __name__ == .__main__.:
+
+    # Specifically ignore a line with this text
+    pragma: no cover

.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: python
 python:
+  - "2.7"
   - "3.6"
 install:
   - pip install tox-travis

MANIFEST.in

@@ -1,3 +1,3 @@
-include README.rst
+include README.md
 include LICENSE
 include CHANGES.rst

sphinxcontrib/runcmd/__init__.py

@@ -15,8 +15,7 @@
 RE_SPLIT = re.compile(r"(?P<pattern>.*)(?<!\\)/(?P<replacement>.*)")
 
 
-class CMDCache(object, metaclass=Singleton):  # noqa: E999
-    __metaclass__ = Singleton
+class CMDCache(Singleton):  # noqa: E999
     cache = {}
 
     def get(self, cmd):
@@ -32,16 +31,17 @@ def get(self, cmd):
 def run_command(command):
     true_cmd = shlex.split(command)
     try:
-        result = subprocess.run(
+        subp = subprocess.Popen(
             true_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
     except Exception as e:
         out = ""
         err = e
     else:
+        out, err = subp.communicate()
         encoding = sys.getfilesystemencoding()
-        out = result.stdout.decode(encoding, "replace").rstrip()
-        err = result.stderr.decode(encoding, "replace").rstrip()
+        out = out.decode(encoding, "replace").rstrip()
+        err = err.decode(encoding, "replace").rstrip()
 
     if err and err != "":
         print("Error in runcmd: {}".format(err))
@@ -109,7 +109,7 @@ def run(self):
         # Set up our arguments to run the CodeBlock parent run function
         self.arguments[0] = syntax
         self.content = [output]
-        node = super().run()
+        node = super(RunCmdDirective, self).run()
 
         return node
 

sphinxcontrib/runcmd/utils.py

@@ -3,10 +3,14 @@
 """
 
 
-class Singleton(type):
+class _Singleton(type):
     _instances = {}
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+            cls._instances[cls] = super(_Singleton, cls).__call__(*args, **kwargs)
         return cls._instances[cls]
+
+
+class Singleton(_Singleton("SingletonMeta", (object,), {})):
+    pass

tests/test_utils.py

@@ -1,7 +1,7 @@
 from sphinxcontrib.runcmd.utils import Singleton
 
 
-class TheSingleton(object, metaclass=Singleton):  # noqa: E999
+class TheSingleton(Singleton):
     pass
 
 

tox.ini

@@ -1,12 +1,16 @@
 [tox]
-envlist = formatting, py36
+envlist = formatting, py27, py36, coverage
 
 [testenv]
 usedevelop = True
 deps = .[test]
 setenv =
     PYTHONPATH = {toxinidir}
-commands = py.test --cov-config=tox.ini --cov=sphinxcontrib --verbose --tb=long
+    py{27,36}: COVERAGE_FILE={envdir}/.coverage
+commands =
+    py{27,36}: py.test --cov=sphinxcontrib --verbose --tb=long
+    coverage: /usr/bin/env bash -c "{envpython} -m coverage combine {toxworkdir}/py*/.coverage"
+    coverage: coverage report
 
 [testenv:formatting]
 basepython = python3.6
@@ -35,14 +39,3 @@ not_skip=__init__.py
 max-line-length = 88
 ignore = E203
 inline-quotes = double
-
-[report]
-show_missing = True
-skip_covered = True
-precision = 2
-exclude_lines =
-    # Ignore unreachable code
-    if __name__ == .__main__.:
-
-    # Specifically ignore a line with this text
-    pragma: no cover