[Python-modules-commits] [pylama] 01/03: Import pylama_7.3.3.orig.tar.gz

[ChangZhuo Chen]

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

czchen pushed a commit to branch master
in repository pylama.

commit 63f16813afdeed7accde9484c0ade0845f022c3f
Author: ChangZhuo Chen (陳昌倬) <czchen at czchen.org>
Date:   Mon Jan 2 02:19:35 2017 +0800

    Import pylama_7.3.3.orig.tar.gz
---
 PKG-INFO                 |  4 ++--
 pylama.egg-info/PKG-INFO |  4 ++--
 pylama/__init__.py       |  2 +-
 pylama/config.py         | 26 ++++++++++++++------------
 setup.py                 |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 60dd522..a0e1ebc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,9 +1,9 @@
 Metadata-Version: 1.1
 Name: pylama
-Version: 7.3.1
+Version: 7.3.3
 Summary: pylama -- Code audit tool for python
 
-Home-page:  http://github.com/klen/pylama
+Home-page:  https://github.com/klen/pylama
 Author: Kirill Klenov
 Author-email: horneds at gmail.com
 License: GNU LGPL
diff --git a/pylama.egg-info/PKG-INFO b/pylama.egg-info/PKG-INFO
index 60dd522..a0e1ebc 100644
--- a/pylama.egg-info/PKG-INFO
+++ b/pylama.egg-info/PKG-INFO
@@ -1,9 +1,9 @@
 Metadata-Version: 1.1
 Name: pylama
-Version: 7.3.1
+Version: 7.3.3
 Summary: pylama -- Code audit tool for python
 
-Home-page:  http://github.com/klen/pylama
+Home-page:  https://github.com/klen/pylama
 Author: Kirill Klenov
 Author-email: horneds at gmail.com
 License: GNU LGPL
diff --git a/pylama/__init__.py b/pylama/__init__.py
index 40c6e1f..02bc610 100644
--- a/pylama/__init__.py
+++ b/pylama/__init__.py
@@ -4,7 +4,7 @@
 :license: BSD, see LICENSE for more details.
 """
 
-__version__ = "7.3.1"
+__version__ = "7.3.3"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <horneds at gmail.com>"
 __license__ = "GNU LGPL"
diff --git a/pylama/config.py b/pylama/config.py
index 937f117..ecee634 100644
--- a/pylama/config.py
+++ b/pylama/config.py
@@ -148,22 +148,16 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
     options.file_params = dict()
     options.linters_params = dict()
 
-    # Override options
-    for k, v in overrides.items():
-        passed_value = getattr(options, k, _Default())
-        if isinstance(passed_value, _Default):
-            setattr(options, k, process_value(k, v))
-
     # Compile options from ini
     if config:
         cfg = get_config(str(options.options), rootdir=rootdir)
-        for k, v in cfg.default.items():
-            LOGGER.info('Find option %s (%s)', k, v)
-            passed_value = getattr(options, k, _Default())
+        for opt, val in cfg.default.items():
+            LOGGER.info('Find option %s (%s)', opt, val)
+            passed_value = getattr(options, opt, _Default())
             if isinstance(passed_value, _Default):
-                if k == 'paths':
-                    v = v.split()
-                setattr(options, k, _Default(v))
+                if opt == 'paths':
+                    val = val.split()
+                setattr(options, opt, _Default(val))
 
         # Parse file related options
         for name, opts in cfg.sections.items():
@@ -183,6 +177,14 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
             mask = re.compile(fnmatch.translate(name))
             options.file_params[mask] = dict(opts)
 
+    # Override options
+    for opt, val in overrides.items():
+        passed_value = getattr(options, opt, _Default())
+        if opt in ('ignore', 'select') and passed_value:
+            setattr(options, opt, process_value(opt, passed_value.value) + process_value(opt, val))
+        elif isinstance(passed_value, _Default):
+            setattr(options, opt, process_value(opt, val))
+
     # Postprocess options
     for name in options.__dict__:
         value = getattr(options, name)
diff --git a/setup.py b/setup.py
index c80532e..a6547f5 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ meta = dict(
 
     author='Kirill Klenov',
     author_email='horneds at gmail.com',
-    url=' http://github.com/klen/pylama',
+    url=' https://github.com/klen/pylama',
 
     packages=find_packages(exclude=['plugins']),
 

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