diff -Nru python-formencode-1.3.0/debian/changelog python-formencode-1.3.0/debian/changelog --- python-formencode-1.3.0/debian/changelog 2016-04-20 16:08:52.000000000 +0000 +++ python-formencode-1.3.0/debian/changelog 2019-04-24 19:53:05.000000000 +0000 @@ -1,3 +1,78 @@ +python-formencode (1.3.0-3ubuntu1~ubuntu19.10.1~ppa201904241553) eoan; urgency=medium + + * No-change backport to eoan + + -- Corey Bryant Wed, 24 Apr 2019 15:53:05 -0400 + +python-formencode (1.3.0-3ubuntu1) eoan; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + - d/p/*: Handle CRLF differences in patches. + - d/watch: Update to use pypi.debian.net. + + -- Corey Bryant Tue, 23 Apr 2019 16:00:12 -0400 + +python-formencode (1.3.0-3) unstable; urgency=medium + + [ Chris Lamb ] + * Move from git-dpm -> gbp. + * Use "alpha_2" over "alpha2" for compatibility with newer versions of + pycountry. (Closes: #880247) + * wrap-and-sort -sa. + * Bump Standards-Version to 4.1.5. + * Install examples. + * Move to debhelper compat level 11. + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + * d/copyright: Use https protocol in Format field + * d/changelog: Remove trailing whitespaces + * d/control: Remove trailing whitespaces + * d/control: Remove ancient X-Python-Version field + * d/control: Remove ancient X-Python3-Version field + + -- Chris Lamb Mon, 06 Aug 2018 22:42:30 +0800 + +python-formencode (1.3.0-2) unstable; urgency=medium + + * Add myself to Uploaders field. + * Don't ship files in /usr/lib/python{2.7,3}/dist-packages/docs. + (Closes: #860146) + + -- Chris Lamb Fri, 14 Apr 2017 09:11:53 +0100 + +python-formencode (1.3.0-1) unstable; urgency=low + + [ Neil Muller] + * New upstream release. + * Add recent fixes from upstream to fix syntax errors in the *.po + files. + * Reformat copyright to the machine readable format. + - Update some stale information. + * Add myself to Uploaders. + * Bump standards version to 3.9.8 (No further changes needed). + * Tweak packages descriptions. + * Add debian/0004-Remove-test_email-dns-tests.patch to disable new + tests which require dns. + + [ Piotr Ożarowski ] + * Bump minimum required Python version to 2.6 + * Add python3-formencode binary package + * Replace python-dns with python-dnspython dependency + * Add disable_pkg_resources_in_tests patch - this makes it possible to run + tests after build (and is useless anyway) + + [ Stefano Rivera ] + * Refresh patches. + * Move from SVN to Git, update Vcs-* fields. + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + -- Neil Muller Fri, 17 Jun 2016 22:47:57 +0000 + python-formencode (1.3.0-0ubuntu5) xenial; urgency=medium * Restore dropped rule. @@ -29,6 +104,7 @@ * New upstream release * Build with python3 * debian/watch: update. + * debian/watch: update. * debian/patches/ubuntu-disable-tests.diff: Disable some tests to allow formencode to build @@ -116,7 +192,7 @@ -- Piotr Ożarowski Tue, 25 Nov 2008 19:24:20 +0100 python-formencode (1.1-1) experimental; urgency=low - + [ Carlos Galisteo ] * debian/control: - Added Homepage field. diff -Nru python-formencode-1.3.0/debian/compat python-formencode-1.3.0/debian/compat --- python-formencode-1.3.0/debian/compat 2013-12-02 20:05:58.000000000 +0000 +++ python-formencode-1.3.0/debian/compat 2019-04-23 18:46:02.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru python-formencode-1.3.0/debian/control python-formencode-1.3.0/debian/control --- python-formencode-1.3.0/debian/control 2016-02-18 14:23:05.000000000 +0000 +++ python-formencode-1.3.0/debian/control 2019-04-23 19:59:31.000000000 +0000 @@ -1,49 +1,57 @@ Source: python-formencode Section: python Priority: optional -Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3), python-setuptools (>= 0.6a9), - python3-all, python3-setuptools, -# used in tests: - python-nose, python-pycountry, python-dnspython, - python3-nose, python3-pycountry, python3-dnspython -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Fabio Tranchitella -Uploaders: Debian Python Modules Team , - Piotr Ożarowski -Standards-Version: 3.9.6 -X-Python-Version: >= 2.4 -X-Python3-Version: >= 3.3 -Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-formencode/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-formencode/trunk/ +Build-Depends: + debhelper (>= 11~), + dh-python, + python-all (>= 2.6.6-3), + python-dnspython , + python-nose , + python-pycountry (>= 17.5.14) , + python-setuptools (>= 0.6a9), + python3-all, + python3-dnspython , + python3-nose , + python3-setuptools, +Maintainer: Fabio Tranchitella +Uploaders: + Debian Python Modules Team , + Piotr Ożarowski , + Neil Muller , + Chris Lamb , +Standards-Version: 4.1.5 +Vcs-Git: https://salsa.debian.org/python-team/modules/python-formencode.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/python-formencode Homepage: http://formencode.org Package: python-formencode Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-dnspython, python-pkg-resources, - python (>= 2.5) | python-elementtree, formencode-i18n -Suggests: python-egenix-mxdatetime +Depends: + python-dnspython, + python-pkg-resources, + ${misc:Depends}, + ${python:Depends}, +Suggests: + python-egenix-mxdatetime, Description: validation and form generation Python package - FormEncode is a validation and form generation package. The validation can - be used separately from the form generation. The validation works on compound - data structures, with all parts being nestable. It is separate from HTTP or + FormEncode is a validation and form generation package. The validation can + be used separately from the form generation. The validation works on compound + data structures, with all parts being nestable. It is separate from HTTP or any other input mechanism. + . + This package contains the Python 2 version of FormEncode. Package: python3-formencode Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, python3-dnspython, python3-pkg-resources, - python3 | python3-elementtree, formencode-i18n -Suggests: python3-egenix-mxdatetime -Description: validation and form generation Python package (Python 3) - FormEncode is a validation and form generation package. The validation can - be used separately from the form generation. The validation works on compound - data structures, with all parts being nestable. It is separate from HTTP or - any other input mechanism. - -Package: formencode-i18n -Architecture: all -Depends: ${misc:Depends} -Description: common locale data and translations for Python FormEncode - FormEncode is a validation and form generation package. The validation can - be used separately from the form generation. The validation works on compound - data structures, with all parts being nestable. It is separate from HTTP or +Depends: + python3-dnspython, + python3-pkg-resources, + ${misc:Depends}, + ${python3:Depends}, +Description: validation and form generation Python 3 package + FormEncode is a validation and form generation package. The validation can + be used separately from the form generation. The validation works on compound + data structures, with all parts being nestable. It is separate from HTTP or any other input mechanism. + . + This package contains the Python 3 version of FormEncode. diff -Nru python-formencode-1.3.0/debian/copyright python-formencode-1.3.0/debian/copyright --- python-formencode-1.3.0/debian/copyright 2011-04-07 21:33:18.000000000 +0000 +++ python-formencode-1.3.0/debian/copyright 2019-04-23 19:40:10.000000000 +0000 @@ -1,37 +1,45 @@ -This package was debianized by Fabio Tranchitella -on Wed, 02 Feb 2006. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FormEncode +Upstream-Contact: Christopher Lambacher +Source: http://www.formencode.org/ + +Files: * +Copyright: 2001-2014 Ian Bicking + 2015 Ian Bicking and FormEncode Contributors +License: MIT + +Files: docs/_themes/old/static/old.css +Copyright: Public domain +License: public-domain +Comment: + A modified version of the default docutils stylesheet, so released + in the public domain. + +Files: debian/* +Copyright: 2006-2008 Tranchitella + 2008-2015 Debian Python Modules Team + 2016 Neil Muller +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. -It was downloaded from http://formencode.org. - -Upstream Author: Ian Bicking - -Copyright: - - Copyright (C) 2001-2008 Ian Bicking - -License: - - This package is licensed under the MIT License, as confirmed by - the upstream author, but actually the tarball lacks of a clear - license statement which will be included with the next release. - -MIT License: - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. +License: public-domain + This stylesheet has been placed in the public domain. diff -Nru python-formencode-1.3.0/debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch python-formencode-1.3.0/debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch --- python-formencode-1.3.0/debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch 2019-04-23 20:00:12.000000000 +0000 @@ -0,0 +1,149 @@ +From: "drnlmuller+debian@gmail.com" +Date: Tue, 14 Jun 2016 14:38:32 +0200 +Subject: Fix a collection of errors from msgfmt. + +Origin: upstream, https://github.com/formencode/formencode/commit/1fdeaabe07167b657db455b3053d7d09d6784f60 +and https://github.com/formencode/formencode/commit/88c4e8cae3975565e65e7f5e751e16c09a5ae982 + +Fix a number of minor issues that msgfmt marks as errors. This includes +missing format specifiers, invalid format strings due to translating the +substiution name and typos in the translated format string. +--- + formencode/i18n/it/LC_MESSAGES/FormEncode.po | 2 +- + formencode/i18n/ja/LC_MESSAGES/FormEncode.po | 2 +- + formencode/i18n/ko/LC_MESSAGES/FormEncode.po | 2 +- + formencode/i18n/nl/LC_MESSAGES/FormEncode.po | 8 +++++--- + formencode/i18n/sl/LC_MESSAGES/FormEncode.po | 2 -- + formencode/i18n/sr/LC_MESSAGES/FormEncode.po | 4 ++-- + formencode/i18n/sv/LC_MESSAGES/FormEncode.po | 4 ++-- + 7 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/formencode/i18n/it/LC_MESSAGES/FormEncode.po b/formencode/i18n/it/LC_MESSAGES/FormEncode.po +index f9a2304..5290851 100644 +--- a/formencode/i18n/it/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/it/LC_MESSAGES/FormEncode.po +@@ -440,7 +440,7 @@ + #: formencode/validators.py:2075 + #, python-format + msgid "The %(part)s value you gave is not a number: %(number)r" +-msgstr "%(part), non e' un numero: %(number)r" ++msgstr "%(part)s, non e' un numero: %(number)r" + + #: formencode/validators.py:2076 + #, python-format +diff --git a/formencode/i18n/ja/LC_MESSAGES/FormEncode.po b/formencode/i18n/ja/LC_MESSAGES/FormEncode.po +index e611686..3d1bdc8 100644 +--- a/formencode/i18n/ja/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/ja/LC_MESSAGES/FormEncode.po +@@ -494,7 +494,7 @@ + #: formencode/validators.py:2586 + #, python-format + msgid "You must give a value for %s" +-msgstr "% の値を入力してください" ++msgstr "%s の値を入力してください" + + #: formencode/validators.py:2619 + #, python-format +diff --git a/formencode/i18n/ko/LC_MESSAGES/FormEncode.po b/formencode/i18n/ko/LC_MESSAGES/FormEncode.po +index def4968..e249992 100644 +--- a/formencode/i18n/ko/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/ko/LC_MESSAGES/FormEncode.po +@@ -327,7 +327,7 @@ + #: formencode/validators.py:1455 + #, python-format + msgid "An error occurred when trying to access the URL: %(error)s" +-msgstr "URL에 접속 시도중 오류가 발생했습니다: $(error)s" ++msgstr "URL에 접속 시도중 오류가 발생했습니다: %(error)s" + + #: formencode/validators.py:1459 + msgid "The server responded that the page could not be found" +diff --git a/formencode/i18n/nl/LC_MESSAGES/FormEncode.po b/formencode/i18n/nl/LC_MESSAGES/FormEncode.po +index aa904af..1fd58f2 100644 +--- a/formencode/i18n/nl/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/nl/LC_MESSAGES/FormEncode.po +@@ -292,7 +292,7 @@ + msgid "" + "The username portion of the email address is invalid (the portion before the " + "@: %(username)s)" +-msgstr "Ongeldig emailadres: het deel vóór de \"@\" is incorrect" ++msgstr "Ongeldig emailadres: het deel vóór de \"@: %(username)s\" is incorrect" + + #: formencode/validators.py:1271 formencode/validators.py:1413 + #, python-format +@@ -305,7 +305,8 @@ + "The domain portion of the email address is invalid (the portion after the @: " + "%(domain)s)" + msgstr "" +-"Ongeldig emailadres: het \"domain\" (het deel achter de \"@\") is incorrect" ++"Ongeldig emailadres: het \"domain\" (het deel achter de \"@: %(domain)s\") " ++"is incorrect" + + #: formencode/validators.py:1275 + #, python-format +@@ -313,7 +314,8 @@ + "The domain of the email address does not exist (the portion after the @: " + "%(domain)s)" + msgstr "" +-"Ongeldig emailadres: het \"domain\" (het deel achter de \"@\") bestaat niet" ++"Ongeldig emailadres: het \"domain\" (het deel achter de \"@: %(domain)s\") " ++"bestaat niet" + + #: formencode/validators.py:1409 + msgid "You must start your URL with http://, https://, etc" +diff --git a/formencode/i18n/sl/LC_MESSAGES/FormEncode.po b/formencode/i18n/sl/LC_MESSAGES/FormEncode.po +index 2eb35ee..56702f5 100644 +--- a/formencode/i18n/sl/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/sl/LC_MESSAGES/FormEncode.po +@@ -302,8 +302,6 @@ + + #: formencode/validators.py:1275 + #, fuzzy, python-format +-#| msgid "" "The domain portion of the email address is invalid (the portion +-#| after the" " @: %(domain)s)" + msgid "" + "The domain of the email address does not exist (the portion after the @: " + "%(domain)s)" +diff --git a/formencode/i18n/sr/LC_MESSAGES/FormEncode.po b/formencode/i18n/sr/LC_MESSAGES/FormEncode.po +index 5caa58a..ff8c168 100644 +--- a/formencode/i18n/sr/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/sr/LC_MESSAGES/FormEncode.po +@@ -2,7 +2,7 @@ + # Copyright (C) 2013 Laboratorijski informacioni sistemi + # This file is distributed under the same license as the FormEncode project. + # Andrija Zaric , 2012. +-# Updated by Nina Plakalovic , 2013 ++# Updated by Nina Plakalovic , 2013, Miloš Gavrilov, 2016. + # + msgid "" + msgstr "" +@@ -373,7 +373,7 @@ + + #: formencode/validators.py:1942 + msgid "Please enter a month from 1 to 12" +-msgstr "Молим, унесите даутм у облику %(format)s" ++msgstr "Молим, унесите месец између 1 и 12" + + #: formencode/validators.py:1943 + msgid "Please enter a valid day" +diff --git a/formencode/i18n/sv/LC_MESSAGES/FormEncode.po b/formencode/i18n/sv/LC_MESSAGES/FormEncode.po +index fcb3cf2..aa71a92 100644 +--- a/formencode/i18n/sv/LC_MESSAGES/FormEncode.po ++++ b/formencode/i18n/sv/LC_MESSAGES/FormEncode.po +@@ -118,7 +118,7 @@ + #: formencode/schema.py:68 + #, python-format + msgid "The input field %(name)s was not expected." +-msgstr "Inmatningsfältet %(namn) var inte förväntat." ++msgstr "Inmatningsfältet %(name)s var inte förväntat." + + #: formencode/schema.py:69 + msgid "Missing value" +@@ -331,7 +331,7 @@ + #: formencode/validators.py:1461 + #, python-format + msgid "You must provide a full domain name (like %(domain)s.com)" +-msgstr "Du måste ange ett komplett domännamn (som %(domän)er.com" ++msgstr "Du måste ange ett komplett domännamn (som %(domain)s.com" + + #: formencode/validators.py:1602 + msgid "" diff -Nru python-formencode-1.3.0/debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch python-formencode-1.3.0/debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch --- python-formencode-1.3.0/debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch 2019-04-23 20:00:12.000000000 +0000 @@ -0,0 +1,32 @@ +From: "drnlmuller+debian@gmail.com" +Date: Tue, 14 Jun 2016 14:40:12 +0200 +Subject: Remove tests from test_email that require dns. + +Some of the new tests in test_email also require dns. This patch +removes them so the build does not require network access. +--- + formencode/tests/test_email.py | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/formencode/tests/test_email.py b/formencode/tests/test_email.py +index 3ebf120..2305454 100644 +--- a/formencode/tests/test_email.py ++++ b/formencode/tests/test_email.py +@@ -65,17 +65,3 @@ + + for email, expected in valid_email_addresses: + self.assertEqual(self.validate(email), expected) +- +- +-class TestUnicodeEmailWithResolveDomain(unittest.TestCase): +- +- def setUp(self): +- self.validator = Email(resolve_domain=True) +- +- def test_unicode_ascii_subgroup(self): +- self.assertEqual(self.validator.to_python( +- u'foo@yandex.com'), 'foo@yandex.com') +- +- def test_cyrillic_email(self): +- self.assertEqual(self.validator.to_python( +- u'me@письмо.рф'), u'me@письмо.рф') diff -Nru python-formencode-1.3.0/debian/patches/0005-Use-alpha_2-over-alpha2-for-compatibility-with-newer-.patch python-formencode-1.3.0/debian/patches/0005-Use-alpha_2-over-alpha2-for-compatibility-with-newer-.patch --- python-formencode-1.3.0/debian/patches/0005-Use-alpha_2-over-alpha2-for-compatibility-with-newer-.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/0005-Use-alpha_2-over-alpha2-for-compatibility-with-newer-.patch 2019-04-23 20:00:12.000000000 +0000 @@ -0,0 +1,38 @@ +From: Chris Lamb +Date: Mon, 6 Aug 2018 22:29:58 +0800 +Subject: Use "alpha_2" over "alpha2" for compatibility with newer versions of + pycountry. + +--- + formencode/national.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/formencode/national.py b/formencode/national.py +index a8514ab..5a55fab 100644 +--- a/formencode/national.py ++++ b/formencode/national.py +@@ -85,19 +85,19 @@ + _l = lambda t: gettext.dgettext('iso639', t) + + def get_countries(): +- c1 = set([(e.alpha2, _c(e.name)) for e in pycountry.countries]) ++ c1 = set([(e.alpha_2, _c(e.name)) for e in pycountry.countries]) + ret = c1.union(country_additions + fuzzy_countrynames) + return ret + + def get_country(code): +- return _c(pycountry.countries.get(alpha2=code).name) ++ return _c(pycountry.countries.get(alpha_2=code).name) + + def get_languages(): +- return [(e.alpha2, _l(e.name)) for e in pycountry.languages +- if e.name and getattr(e, 'alpha2', None)] ++ return [(e.alpha_2, _l(e.name)) for e in pycountry.languages ++ if e.name and getattr(e, 'alpha_2', None)] + + def get_language(code): +- return _l(pycountry.languages.get(alpha2=code).name) ++ return _l(pycountry.languages.get(alpha_2=code).name) + + + ############################################################ diff -Nru python-formencode-1.3.0/debian/patches/disable_pkg_resources_in_tests.patch python-formencode-1.3.0/debian/patches/disable_pkg_resources_in_tests.patch --- python-formencode-1.3.0/debian/patches/disable_pkg_resources_in_tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/disable_pkg_resources_in_tests.patch 2019-04-23 20:00:12.000000000 +0000 @@ -0,0 +1,21 @@ +From: Stefano Rivera +Date: Sun, 11 Oct 2015 22:20:18 +0200 +Subject: disable_pkg_resources_in_tests + +Patch-Name: disable_pkg_resources_in_tests.patch +--- + formencode/tests/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/formencode/tests/__init__.py b/formencode/tests/__init__.py +index a380a39..7fa25b4 100644 +--- a/formencode/tests/__init__.py ++++ b/formencode/tests/__init__.py +@@ -12,5 +12,5 @@ + import warnings + warnings.simplefilter('default') + +-import pkg_resources +-pkg_resources.require('FormEncode') ++#import pkg_resources ++#pkg_resources.require('FormEncode') diff -Nru python-formencode-1.3.0/debian/patches/remove-dns-tests.diff python-formencode-1.3.0/debian/patches/remove-dns-tests.diff --- python-formencode-1.3.0/debian/patches/remove-dns-tests.diff 2015-11-09 10:59:22.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/remove-dns-tests.diff 2019-04-23 20:00:12.000000000 +0000 @@ -1,8 +1,17 @@ +From: Stefano Rivera +Date: Sun, 11 Oct 2015 22:20:17 +0200 +Subject: remove-dns-tests.diff + Tests that require network (DNS) access -Index: python-formencode-1.3.0/formencode/validators.py -=================================================================== ---- python-formencode-1.3.0.orig/formencode/validators.py -+++ python-formencode-1.3.0/formencode/validators.py +Patch-Name: remove-dns-tests.diff +--- + formencode/validators.py | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/formencode/validators.py b/formencode/validators.py +index c332ec9..cfba7c8 100644 +--- a/formencode/validators.py ++++ b/formencode/validators.py @@ -1288,20 +1288,6 @@ class Email(FancyValidator): 'nobody@xn--m7r7ml7t24h.com' >>> e.to_python('o*reilly@test.com') diff -Nru python-formencode-1.3.0/debian/patches/series python-formencode-1.3.0/debian/patches/series --- python-formencode-1.3.0/debian/patches/series 2016-04-11 23:12:41.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/series 2019-04-23 20:00:12.000000000 +0000 @@ -1,3 +1,6 @@ remove-dns-tests.diff -ubuntu-disable-tests.diff +disable_pkg_resources_in_tests.patch +0003-Fix-a-collection-of-errors-from-msgfmt.patch +0004-Remove-tests-from-test_email-that-require-dns.patch +0005-Use-alpha_2-over-alpha2-for-compatibility-with-newer-.patch fix-tld-regex.diff diff -Nru python-formencode-1.3.0/debian/patches/ubuntu-disable-tests.diff python-formencode-1.3.0/debian/patches/ubuntu-disable-tests.diff --- python-formencode-1.3.0/debian/patches/ubuntu-disable-tests.diff 2015-11-09 11:15:07.000000000 +0000 +++ python-formencode-1.3.0/debian/patches/ubuntu-disable-tests.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -Index: python-formencode-1.3.0/formencode/tests/__init__.py -=================================================================== ---- python-formencode-1.3.0.orig/formencode/tests/__init__.py -+++ python-formencode-1.3.0/formencode/tests/__init__.py -@@ -11,6 +11,3 @@ os.environ['LANGUAGE'] = 'C' - # Enable deprecation warnings (disabled by default in Python > 2.6). - import warnings - warnings.simplefilter('default') -- --import pkg_resources --pkg_resources.require('FormEncode') -Index: python-formencode-1.3.0/formencode/tests/htmlfill_data/data-fill4.txt -=================================================================== ---- python-formencode-1.3.0.orig/formencode/tests/htmlfill_data/data-fill4.txt -+++ python-formencode-1.3.0/formencode/tests/htmlfill_data/data-fill4.txt -@@ -1,30 +0,0 @@ --
-- -- -- -- -- -- ------ -- -- -- -- -- -- -- ------ --defaults = {'name': 'Bob Jones', -- 'occupation': ['Crazy Cultist','Crazy'], -- 'address': '14 W. Canal\nNew Guinea', -- 'living': 'no', -- 'nice_guy': 0} -Index: python-formencode-1.3.0/formencode/tests/htmlfill_data/data-error1.txt -=================================================================== ---- python-formencode-1.3.0.orig/formencode/tests/htmlfill_data/data-error1.txt -+++ python-formencode-1.3.0/formencode/tests/htmlfill_data/data-error1.txt -@@ -1,47 +0,0 @@ -- -- -- -- --!!!!!! -- -- -- -- -- -- -- -- -- -- --This should not display -- -- ------ -- -- -- -- --!!!<HEY>!!! -- -- -- --<error
-- -- -- --last
-- -- ------ --defaults = {} --errors = dict( -- t1='', -- t2='