update to pep8-1.7.0

ok shadchin@ jca@
This commit is contained in:
danj 2016-03-27 11:08:05 +00:00
parent 8d3f092925
commit 6d3575c185
3 changed files with 4 additions and 51 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2015/12/24 20:22:37 shadchin Exp $
# $OpenBSD: Makefile,v 1.12 2016/03/27 11:08:05 danj Exp $
COMMENT = python style guide checker
MODPY_EGG_VERSION = 1.6.2
MODPY_EGG_VERSION = 1.7.0
DISTNAME = pep8-${MODPY_EGG_VERSION}
REVISION = 0
CATEGORIES = devel

View File

@ -1,2 +1,2 @@
SHA256 (pep8-1.6.2.tar.gz) = uLfjVjC1U54moZffxgBb6eHpoTVJazd3I6jrwBuby/8=
SIZE (pep8-1.6.2.tar.gz) = 74534
SHA256 (pep8-1.7.0.tar.gz) = oRPV9a16errO+d9ew/KvI6IKKABZIVd7Fd1YTQmdWQA=
SIZE (pep8-1.7.0.tar.gz) = 79704

View File

@ -1,46 +0,0 @@
$OpenBSD: patch-pep8_py,v 1.1 2015/12/24 20:22:37 shadchin Exp $
Reverted a change which had unintended repercussions in flake8.
Refs:
- https://mail.python.org/pipermail/code-quality/2015-March/000515.html
- https://github.com/PyCQA/pep8/commit/435d1cbf995a659a82d1d4b42d25e3459556ef21
--- pep8.py.orig Thu Dec 24 05:59:45 2015
+++ pep8.py Thu Dec 24 06:01:15 2015
@@ -1984,24 +1984,24 @@ def read_config(options, args, arglist, parser):
local_dir = os.curdir
+ if USER_CONFIG and os.path.isfile(USER_CONFIG):
+ if options.verbose:
+ print('user configuration: %s' % USER_CONFIG)
+ config.read(USER_CONFIG)
+
+ parent = tail = args and os.path.abspath(os.path.commonprefix(args))
+ while tail:
+ if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
+ local_dir = parent
+ if options.verbose:
+ print('local configuration: in %s' % parent)
+ break
+ (parent, tail) = os.path.split(parent)
+
if cli_conf and os.path.isfile(cli_conf):
if options.verbose:
print('cli configuration: %s' % cli_conf)
config.read(cli_conf)
- else:
- if USER_CONFIG and os.path.isfile(USER_CONFIG):
- if options.verbose:
- print('user configuration: %s' % USER_CONFIG)
- config.read(USER_CONFIG)
-
- parent = tail = args and os.path.abspath(os.path.commonprefix(args))
- while tail:
- if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
- local_dir = parent
- if options.verbose:
- print('local configuration: in %s' % parent)
- break
- (parent, tail) = os.path.split(parent)
pep8_section = parser.prog
if config.has_section(pep8_section):