Show More
@@ -48,7 +48,7 b' from nose.core import TestProgram' | |||||
48 |
|
48 | |||
49 | # Our own imports |
|
49 | # Our own imports | |
50 | from IPython.utils.importstring import import_item |
|
50 | from IPython.utils.importstring import import_item | |
51 | from IPython.utils.path import get_ipython_module_path |
|
51 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir | |
52 | from IPython.utils.process import find_cmd, pycmd2argv |
|
52 | from IPython.utils.process import find_cmd, pycmd2argv | |
53 | from IPython.utils.sysinfo import sys_info |
|
53 | from IPython.utils.sysinfo import sys_info | |
54 | from IPython.utils.warn import warn |
|
54 | from IPython.utils.warn import warn | |
@@ -280,8 +280,10 b' def make_exclude():' | |||||
280 | exclusions = [s.replace('\\','\\\\') for s in exclusions] |
|
280 | exclusions = [s.replace('\\','\\\\') for s in exclusions] | |
281 |
|
281 | |||
282 | # check for any exclusions that don't seem to exist: |
|
282 | # check for any exclusions that don't seem to exist: | |
|
283 | parent, _ = os.path.split(get_ipython_package_dir()) | |||
283 | for exclusion in exclusions: |
|
284 | for exclusion in exclusions: | |
284 | if not os.path.exists(exclusion) and not os.path.exists(exclusion + '.py'): |
|
285 | fullpath = pjoin(parent, exclusion) | |
|
286 | if not os.path.exists(fullpath) and not os.path.exists(fullpath + '.py'): | |||
285 | warn("Excluding nonexistent file: %r\n" % exclusion) |
|
287 | warn("Excluding nonexistent file: %r\n" % exclusion) | |
286 |
|
288 | |||
287 | return exclusions |
|
289 | return exclusions |
General Comments 0
You need to be logged in to leave comments.
Login now