Bug 1471920 - Fix Python 3 support in mozversion; r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D18063

--HG--
extra : moz-landing-system : lando

testing/mozbase/mozversion/mozversion/mozversion.py

@@ -5,6 +5,7 @@
 from __future__ import absolute_import
 
 import argparse
+import io
 import os
 from six.moves import configparser
 import sys
@@ -63,14 +64,14 @@ class LocalFennecVersion(Version):
         for type, section in INI_DATA_MAPPING:
             filename = "%s.ini" % type
             if filename in archive_list:
-                self._parse_ini_file(archive.open(filename), type,
-                                     section)
+                fp = io.TextIOWrapper(archive.open(filename))
+                self._parse_ini_file(fp, type, section)
             else:
                 self._logger.warning('Unable to find %s' % filename)
 
         if "package-name.txt" in archive_list:
-            self._info["package_name"] = \
-                archive.open("package-name.txt").readlines()[0].strip()
+            fp = io.TextIOWrapper(archive.open("package-name.txt"))
+            self._info["package_name"] = fp.readlines()[0].strip()
 
 
 class LocalVersion(Version):

testing/mozbase/mozversion/setup.cfg

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

testing/mozbase/mozversion/setup.py

@@ -6,7 +6,7 @@ from __future__ import absolute_import
 
 from setuptools import setup
 
-PACKAGE_VERSION = '2.0.0'
+PACKAGE_VERSION = '2.1.0'
 
 
 setup(name='mozversion',
@@ -14,7 +14,7 @@ setup(name='mozversion',
       description='Library to get version information for applications',
       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'],
       keywords='mozilla',
       author='Mozilla Automation and Testing Team',
       author_email='tools@lists.mozilla.org',

testing/mozbase/mozversion/tests/manifest.ini

@@ -3,4 +3,3 @@ subsuite = mozbase
 
 [test_binary.py]
 [test_apk.py]
-skip-if = python == 3