rename greentest/__init__.py to greentest/greentest.py

- greentest is not a package amymore, so it does not require PYTHONPATH to include .. to run

--HG--
rename : greentest/__init__.py => greentest/greentest.py

greentest/generate_report.py

@@ -307,7 +307,7 @@ def main(db):
 
 if __name__=='__main__':
     if not sys.argv[1:]:
-        from greentest.record_results import get_results_db
+        from record_results import get_results_db
         db = get_results_db()
         sys.argv.append(db)
     for db in sys.argv[1:]:

greentest/parse_results.py

@@ -131,11 +131,11 @@ if __name__=='__main__':
     parser.add_option('--redo', action='store_true', default=False)
     options, args = parser.parse_args()
     if not args:
-        from greentest.record_results import get_results_db
+        from record_results import get_results_db
         db = get_results_db()
         args.append(db)
     for db in args:
         if main(db, options):
-            from greentest import generate_report
+            import generate_report
             generate_report.main(db)
 

greentest/test__greenness.py

@@ -27,7 +27,7 @@ from gevent import monkey
 monkey.patch_all()
 
 import greentest
-from greentest import test_support
+import test_support
 import urllib2
 import BaseHTTPServer
 from gevent import spawn

greentest/test_queue.py

@@ -6,7 +6,7 @@ from gevent import queue as Queue
 import threading
 import time
 import unittest
-from greentest import test_support
+import test_support
 
 QUEUE_SIZE = 5
 

greentest/test_socket.py

@@ -4,7 +4,7 @@ from gevent import monkey
 monkey.patch_all()
 
 import greentest
-from greentest import test_support
+import test_support
 
 import socket
 import select

greentest/test_socket_ssl.py

@@ -3,7 +3,7 @@ from gevent import monkey
 monkey.patch_all()
 
 import sys
-from greentest import test_support
+import test_support
 import socket
 import errno
 import greentest

greentest/test_socketserver.py

@@ -3,9 +3,9 @@
 from gevent import monkey
 monkey.patch_all()
 
-from greentest import test_support
-from greentest.test_support import (verbose, verify, TESTFN, TestSkipped,
-                                    reap_children)
+import test_support
+from test_support import (verbose, verify, TESTFN, TestSkipped,
+                          reap_children)
 test_support.requires('network')
 
 from SocketServer import *

greentest/test_support.py

 """Supporting definitions for the Python regression tests."""
 
-if __name__ != 'greentest.test_support':
-    raise ImportError, 'test_support must be imported from the test package'
-
 import sys
 
 class Error(Exception):

greentest/test_thread.py

@@ -5,7 +5,7 @@
 from gevent import monkey
 monkey.patch_all()
 
-from greentest.test_support import verbose
+from test_support import verbose
 import random
 import thread
 import time

greentest/test_threading.py

@@ -5,8 +5,8 @@ monkey.patch_all(thread=True)
 import thread
 print thread.start_new_thread
 
-import greentest.test_support
-from greentest.test_support import verbose
+import test_support
+from test_support import verbose
 import random
 import sys
 import threading
@@ -304,8 +304,8 @@ class ThreadJoinOnShutdown(greentest.TestCase):
 
 
 def test_main():
-    greentest.test_support.run_unittest(ThreadTests,
-                                        ThreadJoinOnShutdown)
+    test_support.run_unittest(ThreadTests,
+                              ThreadJoinOnShutdown)
 
 if __name__ == "__main__":
     test_main()

greentest/test_threading_local.py

@@ -3,7 +3,7 @@ monkey.patch_all()
 import greentest
 import unittest
 from doctest import DocTestSuite
-from greentest import test_support
+import test_support
 
 class ThreadingLocalTest(greentest.TestCase):
     def test_derived(self):

greentest/test_timeout.py

@@ -3,7 +3,7 @@ from gevent import monkey
 monkey.patch_all()
 
 import greentest
-from greentest import test_support
+import test_support
 
 # This requires the 'network' resource as given on the regrtest command line.
 skip_expected = not test_support.is_resource_enabled('network')

greentest/test_urllib2.py

@@ -2,7 +2,7 @@ from gevent import monkey
 monkey.patch_all()
 
 import greentest
-from greentest import test_support
+import test_support
 
 import os
 import socket

greentest/test_urllib2_localnet.py

@@ -8,7 +8,7 @@ import sys
 import urlparse
 import greentest
 import hashlib
-from greentest import test_support
+import test_support
 import threading
 import socket
 import urllib2

greentest/with_timeout.py

@@ -98,7 +98,7 @@ elif sys.argv[1:]==['--selftest1']:
             pass
         def test_long(self):
             time.sleep(10)
-    from greentest import test_support
+    import test_support
     test_support.run_unittest(Test)
     sys.exit(0)
 elif sys.argv[1:]==['--selftest2']:
@@ -108,7 +108,7 @@ elif sys.argv[1:]==['--selftest2']:
             fail
         def test_long(self):
             time.sleep(10)
-    from greentest import test_support
+    import test_support
     test_support.run_unittest(Test)
     sys.exit(0)