diff options
Diffstat (limited to 'contrib/python/ipython/py2/IPython')
| -rw-r--r-- | contrib/python/ipython/py2/IPython/core/extensions.py | 6 | ||||
| -rw-r--r-- | contrib/python/ipython/py2/IPython/core/profiledir.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/python/ipython/py2/IPython/core/extensions.py b/contrib/python/ipython/py2/IPython/core/extensions.py index 58855466f12..9559b57398b 100644 --- a/contrib/python/ipython/py2/IPython/core/extensions.py +++ b/contrib/python/ipython/py2/IPython/core/extensions.py @@ -77,9 +77,9 @@ class ExtensionManager(Configurable): with self.shell.builtin_trap: if module_str not in sys.modules: - try: - sys.modules[module_str] = __import__('IPython.extensions.' + module_str) - except ImportError: + try: + sys.modules[module_str] = __import__('IPython.extensions.' + module_str) + except ImportError: __import__(module_str) mod = sys.modules[module_str] if self._call_load_ipython_extension(mod): diff --git a/contrib/python/ipython/py2/IPython/core/profiledir.py b/contrib/python/ipython/py2/IPython/core/profiledir.py index b777f13da0d..e649f45567e 100644 --- a/contrib/python/ipython/py2/IPython/core/profiledir.py +++ b/contrib/python/ipython/py2/IPython/core/profiledir.py @@ -113,10 +113,10 @@ class ProfileDir(LoggingConfigurable): readme = os.path.join(self.startup_dir, 'README') - if not os.path.exists(readme): - import pkgutil + if not os.path.exists(readme): + import pkgutil with open(readme, 'wb') as f: - f.write(pkgutil.get_data(__name__, 'profile/README_STARTUP')) + f.write(pkgutil.get_data(__name__, 'profile/README_STARTUP')) @observe('security_dir') def check_security_dir(self, change=None): |