Skip to content

Commit

Permalink
Merge pull request ipython#1897 from minrk/exclude_glob
Browse files Browse the repository at this point in the history
use glob for bad exclusion warning rather than explicit check for .py

closes ipython#1896
  • Loading branch information
Jonathan March authored and Jonathan March committed Jun 11, 2012
2 parents 18f728c + d9f48f5 commit 1e110af
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion IPython/testing/iptest.py
Expand Up @@ -26,6 +26,7 @@
#-----------------------------------------------------------------------------

# Stdlib
import glob
import os
import os.path as path
import signal
Expand Down Expand Up @@ -293,7 +294,7 @@ def make_exclude():
parent, _ = os.path.split(get_ipython_package_dir())
for exclusion in exclusions:
fullpath = pjoin(parent, exclusion)
if not os.path.exists(fullpath) and not os.path.exists(fullpath + '.py'):
if not os.path.exists(fullpath) and not glob.glob(fullpath + '.*'):
warn("Excluding nonexistent file: %r\n" % exclusion)

return exclusions
Expand Down

0 comments on commit 1e110af

Please sign in to comment.