equal
deleted
inserted
replaced
182 # time. |
182 # time. |
183 if globalname and isinstance(symbol, _demandmod): |
183 if globalname and isinstance(symbol, _demandmod): |
184 symbol._addref(globalname) |
184 symbol._addref(globalname) |
185 |
185 |
186 if level >= 0: |
186 if level >= 0: |
187 # Mercurial's enforced import style does not use |
187 # The "from a import b,c,d" or "from .a import b,c,d" |
188 # "from a import b,c,d" or "from .a import b,c,d" syntax. In |
188 # syntax gives errors with some modules for unknown |
189 # addition, this appears to be giving errors with some modules |
189 # reasons. Work around the problem. |
190 # for unknown reasons. Since we shouldn't be using this syntax |
|
191 # much, work around the problems. |
|
192 if name: |
190 if name: |
193 return _hgextimport(_origimport, name, globals, locals, |
191 return _hgextimport(_origimport, name, globals, locals, |
194 fromlist, level) |
192 fromlist, level) |
195 |
193 |
196 if _pypy: |
194 if _pypy: |