Backed out 3 changesets (bug 1471625) for linting failure on mozinfo/tests/test.py. CLOSED TREE

Backed out changeset 7d0fb7a6b9fa (bug 1471625)
Backed out changeset 217570468fde (bug 1471625)
Backed out changeset 70d0097e8c03 (bug 1471625)

testing/mozbase/mozinfo/mozinfo/string_version.py

@@ -13,7 +13,7 @@ class StringVersion(str):
     """
 
     def __init__(self, vstring):
-        super(StringVersion, self).__init__()
+        str.__init__(self, vstring)
         self.version = LooseVersion(vstring)
 
     def __repr__(self):

testing/mozbase/mozinfo/setup.cfg

@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal=1

testing/mozbase/mozinfo/setup.py

@@ -6,35 +6,30 @@ from __future__ import absolute_import
 
 from setuptools import setup
 
-PACKAGE_VERSION = "1.0.0"
+PACKAGE_VERSION = '0.10'
 
 # dependencies
-deps = ["mozfile >= 0.12"]
+deps = ['mozfile >= 0.12']
 
-setup(
-    name="mozinfo",
-    version=PACKAGE_VERSION,
-    description="Library to get system information for use in Mozilla testing",
-    long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
-    classifiers=[
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Development Status :: 5 - Production/Stable",
-    ],
-    # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
-    keywords="mozilla",
-    author="Mozilla Automation and Testing Team",
-    author_email="tools@lists.mozilla.org",
-    url="https://wiki.mozilla.org/Auto-tools/Projects/Mozbase",
-    license="MPL",
-    packages=["mozinfo"],
-    include_package_data=True,
-    zip_safe=False,
-    install_requires=deps,
-    entry_points="""
+setup(name='mozinfo',
+      version=PACKAGE_VERSION,
+      description="Library to get system information for use in Mozilla testing",
+      long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
+      classifiers=['Programming Language :: Python :: 2.7',
+                   'Programming Language :: Python :: 3'],
+      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      keywords='mozilla',
+      author='Mozilla Automation and Testing Team',
+      author_email='tools@lists.mozilla.org',
+      url='https://wiki.mozilla.org/Auto-tools/Projects/Mozbase',
+      license='MPL',
+      packages=['mozinfo'],
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=deps,
+      entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
       mozinfo = mozinfo:main
       """,
-)
+      )

testing/mozbase/mozinfo/tests/manifest.ini

@@ -1,3 +1,4 @@
 [DEFAULT]
 subsuite = mozbase, os == "linux"
+skip-if = python == 3
 [test.py]

testing/mozbase/mozinfo/tests/test.py

@@ -17,12 +17,6 @@ import mozinfo
 
 import mozunit
 
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    # reload() has been moved to importlib in Python 3
-    # see https://docs.python.org/3.5/library/importlib.html#importlib.reload
-    from importlib import reload
 
 class TestMozinfo(unittest.TestCase):