[Python-modules-commits] [python-flake8] 04/05: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-flake8.

commit 62b28a62032ad6f83739f71e8c69c980907015ae
Merge: 53497c2 a6cf72a
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Mon Jun 20 12:26:23 2016 -0400

    merge patched into master

 CHANGES.rst                                        |  28 ++++-
 CONTRIBUTORS.txt                                   |   1 +
 PKG-INFO                                           |  34 +++++-
 README.rst                                         |   4 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/series                              |   1 -
 debian/patches/update-pyflakes-version.patch       |  33 ------
 flake8.egg-info/PKG-INFO                           |  34 +++++-
 flake8.egg-info/SOURCES.txt                        |   2 -
 flake8.egg-info/pbr.json                           |   1 -
 flake8.egg-info/requires.txt                       |   6 +-
 flake8/__init__.py                                 |   2 +-
 flake8/__init__.pyc                                | Bin 167 -> 168 bytes
 flake8/__pycache__/__init__.cpython-34.pyc         | Bin 154 -> 155 bytes
 flake8/__pycache__/_pyflakes.cpython-34.pyc        | Bin 4332 -> 4375 bytes
 flake8/__pycache__/callbacks.cpython-34.pyc        | Bin 769 -> 770 bytes
 flake8/__pycache__/compat.cpython-34.pyc           | Bin 558 -> 559 bytes
 flake8/__pycache__/engine.cpython-34.pyc           | Bin 9959 -> 10033 bytes
 flake8/__pycache__/hooks.cpython-34.pyc            | Bin 8223 -> 8160 bytes
 flake8/__pycache__/main.cpython-34.pyc             | Bin 4568 -> 4536 bytes
 flake8/__pycache__/reporter.cpython-34.pyc         | Bin 4552 -> 4515 bytes
 flake8/__pycache__/util.cpython-34.pyc             | Bin 2513 -> 3052 bytes
 flake8/_pyflakes.py                                |   3 +-
 flake8/_pyflakes.pyc                               | Bin 4822 -> 4805 bytes
 flake8/callbacks.pyc                               | Bin 985 -> 989 bytes
 flake8/compat.pyc                                  | Bin 647 -> 646 bytes
 flake8/engine.py                                   |   4 +-
 flake8/engine.pyc                                  | Bin 11275 -> 11278 bytes
 flake8/hooks.py                                    |   8 +-
 flake8/hooks.pyc                                   | Bin 9208 -> 8897 bytes
 flake8/main.py                                     |  25 +++--
 flake8/main.pyc                                    | Bin 5229 -> 5166 bytes
 flake8/reporter.py                                 |   6 +-
 flake8/reporter.pyc                                | Bin 5237 -> 5173 bytes
 flake8/tests/__init__.pyc                          | Bin 141 -> 142 bytes
 flake8/tests/__pycache__/__init__.cpython-34.pyc   | Bin 137 -> 138 bytes
 .../__pycache__/_test_warnings.cpython-34.pyc      | Bin 6709 -> 6717 bytes
 .../tests/__pycache__/test_engine.cpython-34.pyc   | Bin 10281 -> 10308 bytes
 flake8/tests/__pycache__/test_hooks.cpython-34.pyc | Bin 2066 -> 2067 bytes
 .../__pycache__/test_integration.cpython-34.pyc    | Bin 3213 -> 3228 bytes
 flake8/tests/__pycache__/test_main.cpython-34.pyc  | Bin 776 -> 777 bytes
 .../tests/__pycache__/test_pyflakes.cpython-34.pyc | Bin 3477 -> 3478 bytes
 .../tests/__pycache__/test_reporter.cpython-34.pyc | Bin 1956 -> 1957 bytes
 flake8/tests/__pycache__/test_util.cpython-34.pyc  | Bin 3642 -> 6409 bytes
 flake8/tests/_test_warnings.py                     |   2 +-
 flake8/tests/_test_warnings.pyc                    | Bin 7068 -> 7091 bytes
 flake8/tests/test_engine.py                        |   6 +-
 flake8/tests/test_engine.pyc                       | Bin 11801 -> 11546 bytes
 flake8/tests/test_git_hook.pyc                     | Bin 4300 -> 0 bytes
 flake8/tests/test_hooks.pyc                        | Bin 2379 -> 2375 bytes
 flake8/tests/test_integration.py                   |   4 +-
 flake8/tests/test_integration.pyc                  | Bin 3867 -> 3730 bytes
 flake8/tests/test_main.pyc                         | Bin 899 -> 900 bytes
 flake8/tests/test_pyflakes.pyc                     | Bin 3861 -> 3806 bytes
 flake8/tests/test_reporter.pyc                     | Bin 2184 -> 2187 bytes
 flake8/tests/test_util.py                          | 115 ++++++++++++++-------
 flake8/tests/test_util.pyc                         | Bin 4117 -> 6947 bytes
 flake8/util.py                                     |  34 ++++--
 flake8/util.pyc                                    | Bin 3005 -> 3597 bytes
 setup.cfg                                          |   4 +-
 setup.py                                           |   6 +-
 61 files changed, 225 insertions(+), 144 deletions(-)

diff --cc debian/.git-dpm
index 4cadc76,0000000..24b02c4
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
- 92b64a0f0c7ef81e48dad173534273c0c1eaafce
- 92b64a0f0c7ef81e48dad173534273c0c1eaafce
- 5a9c8328c6584d2a2b1b0f34b1150711b716189e
++a6cf72ae957adb0750f166fde066f03ea191ddd9
++a6cf72ae957adb0750f166fde066f03ea191ddd9
++a6cf72ae957adb0750f166fde066f03ea191ddd9
 +a6cf72ae957adb0750f166fde066f03ea191ddd9
 +python-flake8_2.6.0.orig.tar.gz
 +76116256913b8ebae9f3ae14b2c7e1fbd853f253
 +81765
 +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/python-flake8.git