[Python-modules-commits] [python-flake8] 02/03: merge patched into master

[Ondřej Nový]

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

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

commit 6a2593b015c9f7d3dd16c16569447300411424c1
Merge: 7a7bb95 8280129
Author: Ondřej Nový <onovy at debian.org>
Date:   Tue Nov 8 19:20:34 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...revious_unindented_logical_line-attribute.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 .../plugin-development/plugin-parameters.rst       |  1 +
 src/flake8/processor.py                            |  5 ++
 5 files changed, 62 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index d389ef0,0000000..ee91ec4
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
- 2e732f03667a0ee4bff1d9faf1f432cf294e0654
- 2e732f03667a0ee4bff1d9faf1f432cf294e0654
++8280129e7b083f590df8ef8c11cb75739b8553a4
++8280129e7b083f590df8ef8c11cb75739b8553a4
 +a7766c12080ab8db65aa9a24ff3b249035cf132d
 +a7766c12080ab8db65aa9a24ff3b249035cf132d
 +python-flake8_3.0.4+dfsg1.orig.tar.gz
 +d89877daa9197f296ab687f1ca8305a47eeb16c1
 +122292
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Add-previous_unindented_logical_line-attribute.patch
index 0000000,0000000..9048d02
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Add-previous_unindented_logical_line-attribute.patch
@@@ -1,0 -1,0 +1,53 @@@
++From 8280129e7b083f590df8ef8c11cb75739b8553a4 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Tue, 8 Nov 2016 19:20:15 +0100
++Subject: Add previous_unindented_logical_line attribute
++
++Origin: https://gitlab.com/pycqa/flake8/merge_requests/134
++---
++ docs/source/plugin-development/plugin-parameters.rst | 1 +
++ src/flake8/processor.py                              | 5 +++++
++ 2 files changed, 6 insertions(+)
++
++diff --git a/docs/source/plugin-development/plugin-parameters.rst b/docs/source/plugin-development/plugin-parameters.rst
++index fd644bc..c5b5ccb 100644
++--- a/docs/source/plugin-development/plugin-parameters.rst
+++++ b/docs/source/plugin-development/plugin-parameters.rst
++@@ -38,6 +38,7 @@ a file, a plugin can ask for any of the following:
++ - :attr:`~flake8.processor.FileProcessor.noqa`
++ - :attr:`~flake8.processor.FileProcessor.previous_indent_level`
++ - :attr:`~flake8.processor.FileProcessor.previous_logical`
+++- :attr:`~flake8.processor.FileProcessor.previous_unindented_logical_line`
++ - :attr:`~flake8.processor.FileProcessor.tokens`
++ 
++ Some properties are set once per file being processed:
++diff --git a/src/flake8/processor.py b/src/flake8/processor.py
++index 44024e5..b52ef71 100644
++--- a/src/flake8/processor.py
+++++ b/src/flake8/processor.py
++@@ -41,6 +41,7 @@ class FileProcessor(object):
++     - :attr:`noqa`
++     - :attr:`previous_indent_level`
++     - :attr:`previous_logical`
+++    - :attr:`previous_unindented_logical_line`
++     - :attr:`tokens`
++     - :attr:`total_lines`
++     - :attr:`verbose`
++@@ -88,6 +89,8 @@ class FileProcessor(object):
++         self.previous_indent_level = 0
++         #: Previous logical line
++         self.previous_logical = ''
+++        #: Previous unindented (i.e. top-level) logical line
+++        self.previous_unindented_logical_line = ''
++         #: Current set of tokens
++         self.tokens = []
++         #: Total number of lines in the file
++@@ -142,6 +145,8 @@ class FileProcessor(object):
++         if self.logical_line:
++             self.previous_indent_level = self.indent_level
++             self.previous_logical = self.logical_line
+++            if not self.indent_level:
+++                self.previous_unindented_logical_line = self.logical_line
++         self.blank_lines = 0
++         self.tokens = []
++         self.noqa = False
diff --cc debian/patches/series
index 90b3311,0000000..9ae5374
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Removed-pytest-options.patch
 +0002-Remove-upper-constrains-from-upstream-requirements.patch
++0003-Add-previous_unindented_logical_line-attribute.patch

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