[Python-modules-commits] [wtforms] 03/06: merge patched into master

[Orestis Ioannou]

This is an automated email from the git hooks/post-receive script.

oorestisime-guest pushed a commit to branch master
in repository wtforms.

commit 6859684651554916f73b7b1a422dc0325d9a446f
Merge: 3519d32 7dc254e
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Tue Dec 22 00:47:56 2015 +0200

    merge patched into master

 .travis.yml                                      |   3 +
 CHANGES.rst                                      |  11 ++-
 debian/.git-dpm                                  |   6 +-
 debian/patches/fix-apps-not-ready.patch          |  24 -------
 debian/patches/series                            |   1 -
 docs/conf.py                                     |   4 +-
 docs/csrf.rst                                    |   4 +-
 docs/ext.rst                                     |   4 +-
 setup.py                                         |   2 +-
 tests/ext_django/tests.py                        |  10 ++-
 tests/fields.py                                  |  14 +++-
 tests/runtests.py                                |   2 +-
 tests/test_requirements.txt                      |   2 +-
 tests/widgets.py                                 |   7 ++
 wtforms/__init__.py                              |   2 +-
 wtforms/compat.py                                |  21 ++++--
 wtforms/ext/i18n/utils.py                        |   6 +-
 wtforms/ext/sqlalchemy/__init__.py               |   4 +-
 wtforms/ext/sqlalchemy/orm.py                    |   2 +-
 wtforms/fields/core.py                           |  17 +++--
 wtforms/locale/ar/LC_MESSAGES/wtforms.mo         | Bin 0 -> 4506 bytes
 wtforms/locale/{ca => ar}/LC_MESSAGES/wtforms.po |  88 ++++++++++++-----------
 wtforms/locale/ca/LC_MESSAGES/wtforms.mo         | Bin 3393 -> 3393 bytes
 wtforms/locale/ca/LC_MESSAGES/wtforms.po         |   4 +-
 wtforms/locale/cs_CZ/LC_MESSAGES/wtforms.mo      | Bin 3544 -> 3559 bytes
 wtforms/locale/cs_CZ/LC_MESSAGES/wtforms.po      |  45 ++++++------
 wtforms/locale/cy/LC_MESSAGES/wtforms.mo         | Bin 0 -> 3346 bytes
 wtforms/locale/{ca => cy}/LC_MESSAGES/wtforms.po |  85 +++++++++++-----------
 wtforms/locale/fr/LC_MESSAGES/wtforms.po         |  20 +++---
 wtforms/locale/ja/LC_MESSAGES/wtforms.mo         | Bin 0 -> 3934 bytes
 wtforms/locale/{ca => ja}/LC_MESSAGES/wtforms.po |  83 +++++++++++----------
 wtforms/locale/pl/LC_MESSAGES/wtforms.mo         | Bin 3386 -> 3514 bytes
 wtforms/locale/pl/LC_MESSAGES/wtforms.po         |  20 +++---
 wtforms/meta.py                                  |   3 +
 wtforms/validators.py                            |   6 +-
 wtforms/widgets/core.py                          |  11 ++-
 wtforms/widgets/html5.py                         |   8 ++-
 37 files changed, 286 insertions(+), 233 deletions(-)

diff --cc debian/.git-dpm
index 683f110,0000000..2c7e3dd
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
- 2c425a9200395d3a26b47151408e9d328b366471
- 2c425a9200395d3a26b47151408e9d328b366471
- 90c4a66614c01b373031dc94b4132489a7920dc7
++7dc254e99320dc56d47b5e1add88e83b4cf109a9
++7dc254e99320dc56d47b5e1add88e83b4cf109a9
++7dc254e99320dc56d47b5e1add88e83b4cf109a9
 +7dc254e99320dc56d47b5e1add88e83b4cf109a9
 +wtforms_2.1.orig.tar.gz
 +1c38e49e8fa216fcf15e4ae3f30a22f6128530c1
 +148036
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/wtforms.git