Patchwork [5,of,8] demandimport: remove misleading, obsolete comment and code

login
register
mail settings
Submitter Bryan O'Sullivan
Date Dec. 23, 2015, 6:24 a.m.
Message ID <129b519e02b92b1f352d.1450851883@bryano-mbp.local>
Download mbox | patch
Permalink /patch/12269/
State Changes Requested
Delegated to: Yuya Nishihara
Headers show

Comments

Bryan O'Sullivan - Dec. 23, 2015, 6:24 a.m.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1450849087 28800
#      Tue Dec 22 21:38:07 2015 -0800
# Node ID 129b519e02b92b1f352d6776e271b310279b67db
# Parent  030387dc5db0113c41a0b3b4ba72a118aa2bc84b
demandimport: remove misleading, obsolete comment and code

Patch

diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -182,15 +182,6 @@  def _demandimport(name, globals=None, lo
                 symbol._addref(globalname)
 
         if level >= 0:
-            # Mercurial's enforced import style does not use
-            # "from a import b,c,d" or "from .a import b,c,d" syntax. In
-            # addition, this appears to be giving errors with some modules
-            # for unknown reasons. Since we shouldn't be using this syntax
-            # much, work around the problems.
-            if name:
-                return _hgextimport(_origimport, name, globals, locals,
-                                    fromlist, level)
-
             mod = _hgextimport(_origimport, name, globals, locals, fromlist,
                                level)