Merge lp:~canonical-platform-qa/uci-config/py3-packaging into lp:~canonical-ci-engineering/uci-config/trunk

[Leo Arias]

Make uciconfig work compatible with python3.
Added the python3-uci-config debian package.

[Leo Arias (elopio)]

This still needs uci-tests to be py3.

[lp:~canonical-platform-qa/uci-config/py3-packaging]

68. By Leo Arias on 2014-12-06

Added python3 ucitests to the dependencies.

69. By Leo Arias on 2015-01-05

Updated the name of the scripts.

Unmerged revisions

69. By Leo Arias on 2015-01-05

Updated the name of the scripts.

68. By Leo Arias on 2014-12-06

Added python3 ucitests to the dependencies.

67. By Leo Arias on 2014-12-06

Made all the tests pass with py3.

66. By Leo Arias on 2014-12-06

Run the py3 tests.

65. By Leo Arias on 2014-12-05

Make the py3 debian package.

=== modified file 'debian/control'
--- debian/control	2014-04-15 08:13:39 +0000
+++ debian/control	2015-01-05 16:50:11 +0000
@@ -3,9 +3,14 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Vincent Ladeuil <[e-mail]>
-Build-Depends: python-uci-tests,
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-uci-tests,
                python-all,
-               debhelper (>= 9)
+               python-setuptools,
+               python3-all,
+               python3-uci-tests,
+               python3-setuptools
 Standards-Version: 3.9.4
 XS-Testsuite: autopkgtest
 
@@ -14,3 +19,9 @@
 Depends: ${misc:Depends},
          ${python:Depends}
 Description: Ubuntu Continuous Integration configuration framework.
+
+Package: python3-uci-config
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends}
+Description: Ubuntu Continuous Integration configuration framework.

=== added file 'debian/python-uci-config.install'
--- debian/python-uci-config.install	1970-01-01 00:00:00 +0000
+++ debian/python-uci-config.install	2015-01-05 16:50:11 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2*

=== added file 'debian/python3-uci-config.install'
--- debian/python3-uci-config.install	1970-01-01 00:00:00 +0000
+++ debian/python3-uci-config.install	2015-01-05 16:50:11 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3*

=== modified file 'debian/rules'
--- debian/rules	2014-05-20 10:00:02 +0000
+++ debian/rules	2015-01-05 16:50:11 +0000
@@ -2,7 +2,8 @@
 #export DH_VERBOSE=1
 
 %:
-	dh "$@" --with python2
+	dh "$@" --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
+	PYTHONPATH=. uci-run-tests2
 	PYTHONPATH=. uci-run-tests

=== modified file 'uciconfig/errors.py'
--- uciconfig/errors.py	2014-03-23 21:16:02 +0000
+++ uciconfig/errors.py	2015-01-05 16:50:11 +0000
@@ -31,6 +31,7 @@
         return self.fmt.format([], **self.__dict__)
 
     __repr__ = __unicode__
+    __str__ = __unicode__
 
 
 class ParseError(ConfigError):

=== modified file 'uciconfig/options.py'
--- uciconfig/options.py	2014-02-15 16:49:46 +0000
+++ uciconfig/options.py	2015-01-05 16:50:11 +0000
@@ -18,6 +18,7 @@
 
 import os
 import re
+import sys
 import warnings
 
 
@@ -27,6 +28,10 @@
 )
 
 
+if sys.version_info >= (3,):
+    unicode = str
+
+
 class Option(object):
     """An option definition.
 

=== modified file 'uciconfig/tests/test_options.py'
--- uciconfig/tests/test_options.py	2014-02-15 16:49:46 +0000
+++ uciconfig/tests/test_options.py	2015-01-05 16:50:11 +0000
@@ -16,6 +16,7 @@
 
 from __future__ import unicode_literals
 
+import sys
 import unittest
 import warnings
 
@@ -31,6 +32,10 @@
 )
 
 
+if sys.version_info >= (3,):
+    unicode = str
+
+
 class TestOption(unittest.TestCase):
 
     def test_default_value(self):

=== modified file 'uciconfig/tests/test_stacks.py'
--- uciconfig/tests/test_stacks.py	2014-03-26 23:22:19 +0000
+++ uciconfig/tests/test_stacks.py	2015-01-05 16:50:11 +0000
@@ -16,6 +16,7 @@
 
 from __future__ import unicode_literals
 
+import sys
 import unittest
 
 
@@ -33,6 +34,10 @@
 )
 
 
+if sys.version_info >= (3,):
+    unicode = str
+
+
 class TestSectionMatcher(unittest.TestCase):
 
     def setUp(self):
@@ -653,8 +658,14 @@
             self.conf.expand_options('{foo}')
         self.assertEqual('{foo}', cm.exception.string)
         self.assertEqual('foo', cm.exception.refs)
-        self.assertEqual('''Loop involving u'foo' while expanding "{foo}".''',
-                         unicode(cm.exception))
+        if sys.version_info < (3,):
+            self.assertEqual(
+                '''Loop involving u'foo' while expanding "{foo}".''',
+                unicode(cm.exception))
+        else:
+            self.assertEqual(
+                '''Loop involving 'foo' while expanding "{foo}".''',
+                unicode(cm.exception))
 
     def test_indirect_loop(self):
         self.conf.store._load_from_string('''