Python 2.6 support

.travis.yml

@@ -9,7 +9,6 @@ env:
 matrix:
   allow_failures:
     - env: TOXENV=cov
-    - env: TOXENV=py26
 install: 
    - pip install --quiet --use-mirrors tox
 script:

README.rst

@@ -125,12 +125,15 @@ The following package managers are supported:
 - pacman (Arch Linux, Manjaro, ...)
 - rpm (Fedora, Red Hat, OpenSUSE, ...)
 
-The following Python versions are supported:
+The following Python versions are fully supported:
 
 - Python 2.7
 - Python 3.3+
 - PyPy
 
+Python 2.6 should also work, but you need to manually install argparse from the
+`Python Package Index <https://pypi.python.org/pypi/swid_generator/>`__.
+
 Install with pip
 ----------------
 

swid_generator/generators/swid_generator.py

@@ -96,5 +96,5 @@ def create_swid_tags(environment, entity_name, regid, full=False, matcher=all_ma
             payload_tag = _create_payload_tag(pi)
             software_identity.append(payload_tag)
 
-        swidtag_flat = ET.tostring(software_identity, encoding='utf-8', method='xml').replace(b'\n', b'')
+        swidtag_flat = ET.tostring(software_identity, encoding='utf-8').replace(b'\n', b'')
         yield XML_DECLARATION.encode('utf-8') + swidtag_flat

swid_generator/main.py

@@ -24,6 +24,8 @@
 from __future__ import print_function, division, absolute_import, unicode_literals
 
 import sys
+import logging
+import subprocess
 
 from .argparser import MainArgumentParser
 from .environments.environment_registry import EnvironmentRegistry
@@ -36,15 +38,45 @@
 from .exceptions import AutodetectionError, EnvironmentNotInstalledError
 
 
+def py26_check_output(*popenargs, **kwargs):
+    """
+    This function is an ugly hack to monkey patch the backported `check_output`
+    method into the subprocess module.
+
+    Taken from https://gist.github.com/edufelipe/1027906.
+
+    """
+    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
+    output, unused_err = process.communicate()
+    retcode = process.poll()
+    if retcode:
+        cmd = kwargs.get('args')
+        if cmd is None:
+            cmd = popenargs[0]
+        error = subprocess.CalledProcessError(retcode, cmd)
+        error.output = output
+        raise error
+    return output
+
+
 def main():
+    # Python 2.6 compatibility
+    if 'check_output' not in dir(subprocess):
+        # Ugly monkey patching hack ahead
+        logging.debug('Monkey patching subprocess.check_output')
+        subprocess.check_output = py26_check_output
+
+    # Register environments
     environment_registry = EnvironmentRegistry()
     environment_registry.register('rpm', RpmEnvironment)
     environment_registry.register('dpkg', DpkgEnvironment)
     environment_registry.register('pacman', PacmanEnvironment)
 
+    # Parse arguments
     parser = MainArgumentParser(environment_registry)
     options = parser.parse()  # without any parameter it takes arguments passed by command line
 
+    # Get correct environment
     try:
         env = environment_registry.get_environment(options.env)
     except EnvironmentNotInstalledError:
@@ -55,6 +87,8 @@ def main():
         parser.print_usage()
         sys.exit(3)
 
+    # Handle commands
+
     if options.command == 'swid':
         swid_args = {
             'environment': env,

tests/fixtures/rpm_environment.py

@@ -37,13 +37,11 @@ def rpm_document_strings(rpm_environment):
 
 @pytest.fixture
 def rpm_networkmanager_generated(rpm_document_strings):
-    ET.register_namespace('', 'http://standards.iso.org/iso/19770/-2/2014/schema.xsd')
     return get_swid_by_name(rpm_document_strings, 'NetworkManager')
 
 
 @pytest.fixture
 def rpm_documents_as_xml(rpm_document_strings):
-    ET.register_namespace('', 'http://standards.iso.org/iso/19770/-2/2014/schema.xsd')
     return [ET.fromstring(document) for document in rpm_document_strings]
 
 
@@ -56,7 +54,6 @@ def rpm_networkmanager_template():
 
 ### Helper Functions ###
 def get_swid_by_name(rpm_document_strings, name):
-    ET.register_namespace('', 'http://standards.iso.org/iso/19770/-2/2014/schema.xsd')
     for document in rpm_document_strings:
         if name in document.decode('utf8'):
             return ET.fromstring(document)

tox.ini

@@ -10,6 +10,11 @@ commands = py.test \
     --basetemp={envtmpdir} \
     {posargs}
 
+[testenv:py26]
+deps =
+    {[testenv]deps}
+    argparse
+
 [testenv:pypy]
 basepython = pypy