[Python-modules-commits] [python-formencode] 08/11: merge patched into master
Neil Muller
drnlmza-guest at moszumanska.debian.org
Tue Jun 14 13:00:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
drnlmza-guest pushed a commit to branch master
in repository python-formencode.
commit 03234706baf886f50b69272da7543b7df4e620cd
Merge: 83907e2 5b74f4f
Author: Neil <Neil Muller drnlmuller+debian at gmail.com>
Date: Tue Jun 14 14:41:22 2016 +0200
merge patched into master
.gitattributes | 19 ++
.gitignore | 18 ++
.travis.yml | 13 ++
FormEncode.egg-info/PKG-INFO | 23 ---
FormEncode.egg-info/SOURCES.txt | 133 -------------
FormEncode.egg-info/dependency_links.txt | 1 -
FormEncode.egg-info/not-zip-safe | 1 -
FormEncode.egg-info/requires.txt | 6 -
FormEncode.egg-info/top_level.txt | 1 -
PKG-INFO | 23 ---
README.rst | 30 +++
debian/.git-dpm | 6 +-
...03-Fix-a-collection-of-errors-from-msgfmt.patch | 150 ++++++++++++++
...ve-tests-from-test_email-that-require-dns.patch | 33 ++++
.../patches/disable_pkg_resources_in_tests.patch | 2 +-
debian/patches/remove-dns-tests.diff | 4 +-
debian/patches/series | 2 +
docs/Makefile | 130 ++++++++++++
docs/Validator.txt | 16 +-
docs/_static/bitbucket.png | Bin 0 -> 6389 bytes
docs/_static/github.png | Bin 0 -> 3170 bytes
docs/_static/sourceforge.png | Bin 0 -> 2119 bytes
docs/_themes/old/theme.conf | 7 +
docs/conf.py | 217 +++++++++++++++++++++
docs/make.bat | 170 ++++++++++++++++
docs/modules/validators.txt | 1 +
examples/WebwareExamples/__init__.py | 1 +
examples/WebwareExamples/index.py | 101 ++++++++++
examples/webware_example.ini | 20 ++
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.mo | Bin 8537 -> 11923 bytes
formencode/i18n/nl/LC_MESSAGES/FormEncode.po | 120 ++++++------
formencode/i18n/sl/LC_MESSAGES/FormEncode.po | 2 -
formencode/i18n/sr/LC_MESSAGES/FormEncode.po | 4 +-
formencode/i18n/sv/LC_MESSAGES/FormEncode.po | 4 +-
formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.mo | Bin 7440 -> 11161 bytes
formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.po | 123 ++++++------
formencode/schema.py | 1 +
formencode/tests/test_email.py | 14 --
formencode/tests/test_i18n.py | 2 +-
formencode/tests/test_schema.py | 10 +
formencode/tests/test_validators.py | 37 ++++
formencode/tests/test_variabledecode.py | 6 +
formencode/validators.py | 63 +++++-
formencode/variabledecode.py | 2 +-
regen-docs | 9 +
run-tests-generate-coverage-html | 3 +
setup.cfg | 7 +-
setup.py | 2 +-
tox.ini | 24 +++
52 files changed, 1209 insertions(+), 358 deletions(-)
diff --cc debian/.git-dpm
index 2dea9b0,0000000..aa9fe7e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- f03797b4fa10d2def47b99924b4b2c1e47d2ab28
- f03797b4fa10d2def47b99924b4b2c1e47d2ab28
- b28306c3f27bc88f76d21c55c37c3b4a6bc139ba
++5b74f4faf6aa49dd2d1e8d4a034ea776a65ef8c7
++5b74f4faf6aa49dd2d1e8d4a034ea776a65ef8c7
++f78dafd2ec543bf79a20db4a82a47d925f90e571
+f78dafd2ec543bf79a20db4a82a47d925f90e571
+python-formencode_1.3.0.orig.tar.gz
+cde3b9fd7de6896de4b58f70e5c9ada7e4c80477
+219286
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch
index 0000000,0000000..6c57c35
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Fix-a-collection-of-errors-from-msgfmt.patch
@@@ -1,0 -1,0 +1,150 @@@
++From 1cc28c1f9b58456de13765edfde0bb92e9a8cd1d Mon Sep 17 00:00:00 2001
++From: Neil <Neil Muller drnlmuller+debian at 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 @@ msgstr "Inserire i minuti ( dopo i : )"
++ #: 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 @@ msgstr ""
++ #: 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 @@ msgstr "올바른 URL이 아닙니다"
++ #: 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 @@ msgstr ""
++ 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 @@ msgid ""
++ "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 @@ msgid ""
++ "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 @@ msgstr "Domenski del e-poštnega naslova je neveljaven: %(domain)s"
++
++ #: 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 <andrija at lis.rs>, 2012.
++-# Updated by Nina Plakalovic <nina at lis.rs>, 2013
+++# Updated by Nina Plakalovic <nina at lis.rs>, 2013, Miloš Gavrilov, 2016.
++ #
++ msgid ""
++ msgstr ""
++@@ -373,7 +373,7 @@ msgstr "Молим, унесите датум у облику %(format)s"
++
++ #: 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 @@ msgstr "Det språket inte är upptaget i ISO 639"
++ #: 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 @@ msgstr ""
++ #: 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 --cc debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch
index 0000000,0000000..a901ba8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Remove-tests-from-test_email-that-require-dns.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 5b74f4faf6aa49dd2d1e8d4a034ea776a65ef8c7 Mon Sep 17 00:00:00 2001
++From: Neil <Neil Muller drnlmuller+debian at 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 @@ class TestEmail(unittest.TestCase):
++
++ 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 at yandex.com'), 'foo at yandex.com')
++-
++- def test_cyrillic_email(self):
++- self.assertEqual(self.validator.to_python(
++- u'me@письмо.рф'), u'me@письмо.рф')
diff --cc debian/patches/disable_pkg_resources_in_tests.patch
index 7b1f97f,0000000..4843377
mode 100644,000000..100644
--- a/debian/patches/disable_pkg_resources_in_tests.patch
+++ b/debian/patches/disable_pkg_resources_in_tests.patch
@@@ -1,22 -1,0 +1,22 @@@
- From f03797b4fa10d2def47b99924b4b2c1e47d2ab28 Mon Sep 17 00:00:00 2001
++From f45e2cea1b79cfb882843b62df8b66d3a04ebcef Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+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 @@ os.environ['LANGUAGE'] = 'C'
+ import warnings
+ warnings.simplefilter('default')
+
+-import pkg_resources
+-pkg_resources.require('FormEncode')
++#import pkg_resources
++#pkg_resources.require('FormEncode')
diff --cc debian/patches/remove-dns-tests.diff
index 3b3f961,0000000..5257572
mode 100644,000000..100644
--- a/debian/patches/remove-dns-tests.diff
+++ b/debian/patches/remove-dns-tests.diff
@@@ -1,59 -1,0 +1,59 @@@
- From 166fe63f31802865b114e9b36310313b24e9bfea Mon Sep 17 00:00:00 2001
++From b117d46199ed78514fe16222608f069702cbcf0e Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+Date: Sun, 11 Oct 2015 22:20:17 +0200
+Subject: remove-dns-tests.diff
+
+Tests that require network (DNS) access
+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 3b47d14..417d261 100644
++index c332ec9..cfba7c8 100644
+--- a/formencode/validators.py
++++ b/formencode/validators.py
+@@ -1288,20 +1288,6 @@ class Email(FancyValidator):
+ 'nobody at xn--m7r7ml7t24h.com'
+ >>> e.to_python('o*reilly at test.com')
+ 'o*reilly at test.com'
+- >>> e = Email(resolve_domain=True)
+- >>> e.resolve_domain
+- True
+- >>> e.to_python('doesnotexist at colorstudy.com')
+- 'doesnotexist at colorstudy.com'
+- >>> e.to_python('test at nyu.edu')
+- 'test at nyu.edu'
+- >>> # NOTE: If you do not have dnspython installed this example won't work:
+- >>> e.to_python('test at thisdomaindoesnotexistithinkforsure.com')
+- Traceback (most recent call last):
+- ...
+- Invalid: The domain of the email address does not exist (the portion after the @: thisdomaindoesnotexistithinkforsure.com)
+- >>> e.to_python(u'test at google.com')
+- u'test at google.com'
+ >>> e = Email(not_empty=False)
+ >>> e.to_python('')
+
+@@ -1429,22 +1415,6 @@ class URL(FancyValidator):
+ Traceback (most recent call last):
+ ...
+ Invalid: That is not a valid URL
+- >>> u = URL(add_http=False, check_exists=True)
+- >>> u.to_python('http://google.com')
+- 'http://google.com'
+- >>> u.to_python('google.com')
+- Traceback (most recent call last):
+- ...
+- Invalid: You must start your URL with http://, https://, etc
+- >>> u.to_python('http://www.formencode.org/does/not/exist/page.html')
+- Traceback (most recent call last):
+- ...
+- Invalid: The server responded that the page could not be found
+- >>> u.to_python('http://this.domain.does.not.exist.example.org/test.html')
+- ... # doctest: +ELLIPSIS
+- Traceback (most recent call last):
+- ...
+- Invalid: An error occured when trying to connect to the server: ...
+
+ If you want to allow addresses without a TLD (e.g., ``localhost``) you can do::
+
diff --cc debian/patches/series
index b8219e9,0000000..6b1a7d7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,4 @@@
+remove-dns-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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-formencode.git
More information about the Python-modules-commits
mailing list