summaryrefslogtreecommitdiff
path: root/numpy/_import_tools.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/_import_tools.py')
-rw-r--r--numpy/_import_tools.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/numpy/_import_tools.py b/numpy/_import_tools.py
index c0a901a8d..ecf29975b 100644
--- a/numpy/_import_tools.py
+++ b/numpy/_import_tools.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
import os
import sys
@@ -66,9 +68,9 @@ class PackageLoader(object):
break
else:
try:
- exec 'import %s.info as info' % (package_name)
+ exec('import %s.info as info' % (package_name))
info_modules[package_name] = info
- except ImportError, msg:
+ except ImportError as msg:
self.warn('No scipy-style subpackage %r found in %s. '\
'Ignoring: %s'\
% (package_name,':'.join(self.parent_path), msg))
@@ -87,7 +89,7 @@ class PackageLoader(object):
open(info_file,filedescriptor[1]),
info_file,
filedescriptor)
- except Exception,msg:
+ except Exception as msg:
self.error(msg)
info_module = None
@@ -207,7 +209,7 @@ class PackageLoader(object):
if symbols is None:
symbols = eval('dir(%s)' % (package_name),
frame.f_globals,frame.f_locals)
- symbols = filter(lambda s:not s.startswith('_'),symbols)
+ symbols = [s for s in symbols if not s.startswith('_')]
else:
symbols = [symbol]
@@ -241,7 +243,7 @@ class PackageLoader(object):
frame = self.parent_frame
try:
exec (cmdstr, frame.f_globals,frame.f_locals)
- except Exception,msg:
+ except Exception as msg:
self.error('%s -> failed: %s' % (cmdstr,msg))
return True
else: