diff options
author | Andrej Shadura <andrewsh@debian.org> | 2018-10-04 20:58:41 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2018-10-04 20:58:41 +0200 |
commit | 01f9b8f3aff851d99b1108cb87e3b4b8bb7d2f21 (patch) | |
tree | 3a6d0ae39dd5ddeea40061799cedab52787195a7 | |
parent | d5d79889787e8d6021531b415560f54d9da181d3 (diff) |
Import Upstream version 1.3.6
-rw-r--r-- | PKG-INFO | 3 | ||||
-rw-r--r-- | README.txt | 1 | ||||
-rw-r--r-- | mercurial_extension_utils.egg-info/PKG-INFO | 3 | ||||
-rw-r--r-- | mercurial_extension_utils.py | 9 | ||||
-rw-r--r-- | setup.py | 2 |
5 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial_extension_utils -Version: 1.3.4 +Version: 1.3.6 Summary: Mercurial Extension Utils Home-page: http://bitbucket.org/Mekk/mercurial-extension_utils Author: Marcin Kasperski @@ -14,7 +14,6 @@ Description: .. -*- mode: rst -*- This module contains group of reusable functions, which I found useful while writing Mercurial extensions. - |drone-badge| .. contents:: :local: @@ -6,7 +6,6 @@ Mercurial Extension Utils This module contains group of reusable functions, which I found useful while writing Mercurial extensions. -|drone-badge| .. contents:: :local: diff --git a/mercurial_extension_utils.egg-info/PKG-INFO b/mercurial_extension_utils.egg-info/PKG-INFO index c2e7609..d33468a 100644 --- a/mercurial_extension_utils.egg-info/PKG-INFO +++ b/mercurial_extension_utils.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial-extension-utils -Version: 1.3.4 +Version: 1.3.6 Summary: Mercurial Extension Utils Home-page: http://bitbucket.org/Mekk/mercurial-extension_utils Author: Marcin Kasperski @@ -14,7 +14,6 @@ Description: .. -*- mode: rst -*- This module contains group of reusable functions, which I found useful while writing Mercurial extensions. - |drone-badge| .. contents:: :local: diff --git a/mercurial_extension_utils.py b/mercurial_extension_utils.py index c82499d..62e916c 100644 --- a/mercurial_extension_utils.py +++ b/mercurial_extension_utils.py @@ -1010,8 +1010,13 @@ def direct_import_ext(module_name, blocked_modules=None): from mercurial import demandimport if blocked_modules: for blocked_module in blocked_modules: - if blocked_module not in demandimport.ignore: - demandimport.ignore.append(blocked_module) + if hasattr(demandimport, 'IGNORES'): + # Mercurial 4.7 introduced set demandimport.IGNORES + demandimport.IGNORES.add(blocked_module) + else: + # Earlier it was demandimport.ignore, a list + if blocked_module not in demandimport.ignore: + demandimport.ignore.append(blocked_module) # Various attempts to define is_demandimport_enabled try: @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -VERSION = '1.3.4' +VERSION = '1.3.6' LONG_DESCRIPTION = open("README.txt").read() INSTALL_REQUIRES = [] |