Merge pull request #957 from jszakmeister/fix-931

Fix #931: duplicate __init__ modules can be picked up

1 files changed, 3 insertions, 1 deletions

diff --git a/nose/loader.py b/nose/loader.py
index 3744e54..a579372 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -21,7 +21,7 @@ from nose.config import Config
 from nose.importer import Importer, add_path, remove_path
 from nose.selector import defaultSelector, TestAddress
 from nose.util import func_lineno, getpackage, isclass, isgenerator, \
-    ispackage, regex_last_key, resolve_name, transplant_func, \
+    ispackage, regex_last_key, resolve_name, src, transplant_func, \
     transplant_class, test_address
 from nose.suite import ContextSuiteFactory, ContextList, LazySuite
 from nose.pyversion import sort_list, cmp_to_key
@@ -153,6 +153,8 @@ class TestLoader(unittest.TestLoader):
             # http://code.google.com/p/python-nose/issues/detail?id=82
             if entry.startswith('.'):
                 continue
+            if src(entry) == '__init__.py':
+                continue
             entry_path = op_abspath(op_join(path, entry))
             is_file = op_isfile(entry_path)
             wanted = False