Mercurial > hgrepos > Python > libs > ConfigMix

diff configmix/__init__.py @ 207:b3b5ed34d180

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle most flake8 errors and warnings. NOTE: E265 "block comment should start with '# ' ist not yet handled. We would need to adjust our Python style.
author Franz Glasner <fzglas.hg@dom66.de>
date Sun, 05 May 2019 18:29:47 +0200
parents 5064e3a2e54a
children 657cf709463b
line wrap: on
line diff
--- a/configmix/__init__.py	Sun May 05 16:53:13 2019 +0200
+++ b/configmix/__init__.py	Sun May 05 18:29:47 2019 +0200
@@ -34,8 +34,9 @@
 from .config import Configuration
 
 
-COMMENTS = [u("__comment"),
-            u("__doc"),
+COMMENTS = [
+    u("__comment"),
+    u("__doc"),
 ]
 """Prefixes for comment configuration keys that are to be handled as
 comments
@@ -312,12 +313,12 @@
 
         if not isinstance(b, dict):
             return b
-        result = deepcopy(a)
+        result = deepcopy(a)                     # noqa
         for k, v in b.iteritems():
             if k in result and isinstance(result[k], dict):
                 result[k] = dict_merge(result[k], v)
             else:
-                result[k] = deepcopy(v)
+                result[k] = deepcopy(v)          # noqa
         return result