From f2791988f98560a03c791768c79ff6b61ac16807 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 20 Dec 2011 12:20:59 +0000
Subject: [PATCH] fix issue102: report more useful errors and hints for when a
 test directory was renamed and some pyc/__pycache__ remain

---
 CHANGELOG           | 3 ++-
 _pytest/__init__.py | 2 +-
 _pytest/python.py   | 3 ++-
 setup.py            | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3248bcd87..bf9b7465d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,8 @@ Changes between 2.2.1 and 2.2.2.dev
 - use distribute_setup script defaulting to 0.6.24 if no setuptools is installed
 - fix issue101: wrong args to unittest.TestCase test function now
   produce better output
-  
+- fix issue102: report more useful errors and hints for when a 
+  test directory was renamed and some pyc/__pycache__ remain
 
 Changes between 2.2.0 and 2.2.1
 ----------------------------------------
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index e9c53b63b..e67af15f3 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.2.2.dev2'
+__version__ = '2.2.2.dev3'
diff --git a/_pytest/python.py b/_pytest/python.py
index 0dab4b10e..b1d288345 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -259,7 +259,8 @@ class Module(pytest.File, PyCollectorMixin):
                 "  %s\n"
                 "which is not the same as the test file we want to collect:\n"
                 "  %s\n"
-                "HINT: use a unique basename for your test file modules"
+                "HINT: remove __pycache__ / .pyc files and/or use a "
+                "unique basename for your test file modules"
                  % e.args
             )
         #print "imported test module", mod
diff --git a/setup.py b/setup.py
index afa397e4d..142411417 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.2.2.dev2',
+        version='2.2.2.dev3',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -32,7 +32,7 @@ def main():
         author_email='holger at merlinux.eu',
         entry_points= make_entry_points(),
         # the following should be enabled for release
-        install_requires=['py>=1.4.6'],
+        install_requires=['py>=1.4.7.dev2'],
         classifiers=['Development Status :: 6 - Mature',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: MIT License',
@@ -70,4 +70,4 @@ def make_entry_points():
     return {'console_scripts': l}
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()