From 8864659127afd728d2ae3f10664f65bcda6f7417 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Thu, 27 Aug 2015 18:45:31 +0200 Subject: Add Python3 support, use pybuild. --- debian/patches/python3.patch | 81 ++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 82 insertions(+) create mode 100644 debian/patches/python3.patch (limited to 'debian/patches') diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch new file mode 100644 index 0000000..2ac23b6 --- /dev/null +++ b/debian/patches/python3.patch @@ -0,0 +1,81 @@ +Subject: Python3 compat +From: Andrew Shadura + +diff --git a/reconfigure/parsers/iniparse/config.py b/reconfigure/parsers/iniparse/config.py +index d007f16..cc37ac4 100644 +--- a/reconfigure/parsers/iniparse/config.py ++++ b/reconfigure/parsers/iniparse/config.py +@@ -143,7 +143,7 @@ class BasicConfig(ConfigNamespace): + + >>> n.aaa = 42 + >>> del n.x +- >>> print n ++ >>> print(n) + aaa = 42 + name.first = paramjit + name.last = oberoi +@@ -152,7 +152,7 @@ class BasicConfig(ConfigNamespace): + + >>> isinstance(n.name, ConfigNamespace) + True +- >>> print n.name ++ >>> print(n.name) + first = paramjit + last = oberoi + >>> sorted(list(n.name)) +@@ -160,8 +160,8 @@ class BasicConfig(ConfigNamespace): + + Finally, values can be read from a file as follows: + +- >>> from StringIO import StringIO +- >>> sio = StringIO(''' ++ >>> from io import StringIO ++ >>> sio = StringIO(u''' + ... # comment + ... ui.height = 100 + ... ui.width = 150 +@@ -171,7 +171,7 @@ class BasicConfig(ConfigNamespace): + ... ''') + >>> n = BasicConfig() + >>> n._readfp(sio) +- >>> print n ++ >>> print(n) + complexity = medium + data.secret.password = goodness=gracious me + have_python +@@ -199,7 +199,7 @@ class BasicConfig(ConfigNamespace): + + def __str__(self, prefix=''): + lines = [] +- keys = self._data.keys() ++ keys = list(self._data.keys()) + keys.sort() + for name in keys: + value = self._data[name] +@@ -258,7 +258,7 @@ def update_config(target, source): + >>> n.ui.display_clock = True + >>> n.ui.display_qlength = True + >>> n.ui.width = 150 +- >>> print n ++ >>> print(n) + playlist.expand_playlist = True + ui.display_clock = True + ui.display_qlength = True +@@ -267,7 +267,7 @@ def update_config(target, source): + >>> from iniparse import ini + >>> i = ini.INIConfig() + >>> update_config(i, n) +- >>> print i ++ >>> print(i) + [playlist] + expand_playlist = True + +@@ -277,7 +277,7 @@ def update_config(target, source): + width = 150 + + """ +- for name in source: ++ for name in sorted(source): + value = source[name] + if isinstance(value, ConfigNamespace): + if name in target: diff --git a/debian/patches/series b/debian/patches/series index de59d0e..ad4a200 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ remove-external-images.diff +python3.patch -- cgit v1.2.3