From 873f9909b892b711db640f2545f33fc90eb25d0e Mon Sep 17 00:00:00 2001 From: Fantix King Date: Sat, 8 Feb 2014 12:38:30 +0800 Subject: [PATCH] Refs #38, fixed renamed symbols in PY3 --- gevent/backdoor.py | 8 ++++++-- greentest/lock_tests.py | 10 ++++++++-- greentest/monkey_test.py | 11 +++++++---- greentest/test__pywsgi.py | 7 +++++-- greentest/test__refcount.py | 5 ++++- greentest/test__threading_vs_settrace.py | 7 +++++-- greentest/test_threading_2.py | 22 +++++++++++++--------- 7 files changed, 48 insertions(+), 22 deletions(-) diff --git a/gevent/backdoor.py b/gevent/backdoor.py index 656b9e96f..004325a31 100644 --- a/gevent/backdoor.py +++ b/gevent/backdoor.py @@ -71,8 +71,12 @@ def _run(self): # __builtin__.__dict__ in the latter case typing # locals() at the backdoor prompt spews out lots of # useless stuff - import __builtin__ - console.locals["__builtins__"] = __builtin__ + try: + import __builtin__ + console.locals["__builtins__"] = __builtin__ + except ImportError: + import builtins + console.locals["builtins"] = builtins console.interact(banner=self.banner) except SystemExit: # raised by quit() sys.exc_clear() diff --git a/greentest/lock_tests.py b/greentest/lock_tests.py index 5b60e46b5..6578d9c5e 100644 --- a/greentest/lock_tests.py +++ b/greentest/lock_tests.py @@ -3,11 +3,17 @@ """ import sys import time -from thread import start_new_thread, get_ident +try: + from thread import start_new_thread, get_ident +except ImportError: + from _thread import start_new_thread, get_ident import threading import unittest -from test import test_support as support +try: + from test import support +except ImportError: + from test import test_support as support def _wait(): diff --git a/greentest/monkey_test.py b/greentest/monkey_test.py index 3dcba0708..dfb231d7f 100644 --- a/greentest/monkey_test.py +++ b/greentest/monkey_test.py @@ -17,12 +17,15 @@ from gevent import monkey; monkey.patch_all(**kwargs) from patched_tests_setup import disable_tests_in_source -import test.test_support -test.test_support.is_resource_enabled = lambda *args: True -del test.test_support.use_resources +try: + from test import support +except ImportError: + from test import test_support as support +support.is_resource_enabled = lambda *args: True +del support.use_resources if sys.version_info[:2] <= (2, 6): - test.test_support.TESTFN += '_%s' % os.getpid() + support.TESTFN += '_%s' % os.getpid() __file__ = os.path.join(os.getcwd(), test_filename) diff --git a/greentest/test__pywsgi.py b/greentest/test__pywsgi.py index e8947451c..23fae5930 100644 --- a/greentest/test__pywsgi.py +++ b/greentest/test__pywsgi.py @@ -24,7 +24,10 @@ import cgi import os import sys -import StringIO +try: + from StringIO import StringIO +except ImportError: + from io import StringIO try: from wsgiref.validate import validator except ImportError: @@ -1161,7 +1164,7 @@ def make_input(self, data, content_length=None, chunked_input=False): data = chunk_encode(data) chunked_input = True - return Input(StringIO.StringIO(data), content_length=content_length, chunked_input=chunked_input) + return Input(StringIO(data), content_length=content_length, chunked_input=chunked_input) def test_short_post(self): i = self.make_input("1", content_length=2) diff --git a/greentest/test__refcount.py b/greentest/test__refcount.py index 77f597963..1e8e3004a 100644 --- a/greentest/test__refcount.py +++ b/greentest/test__refcount.py @@ -36,7 +36,10 @@ class Socket(socket): from gevent import monkey; monkey.patch_all() from pprint import pformat -from thread import start_new_thread +try: + from thread import start_new_thread +except ImportError: + from _thread import start_new_thread from time import sleep import weakref import gc diff --git a/greentest/test__threading_vs_settrace.py b/greentest/test__threading_vs_settrace.py index f35930179..b5b931efa 100644 --- a/greentest/test__threading_vs_settrace.py +++ b/greentest/test__threading_vs_settrace.py @@ -79,5 +79,8 @@ def test_bootstrap_inner_with_trace(self): if __name__ == "__main__": - import test.test_support - test.test_support.run_unittest(ThreadTrace) + try: + from test import support + except ImportError: + from test import test_support as support + support.run_unittest(ThreadTrace) diff --git a/greentest/test_threading_2.py b/greentest/test_threading_2.py index 1563f2366..c0b95fe72 100644 --- a/greentest/test_threading_2.py +++ b/greentest/test_threading_2.py @@ -31,8 +31,12 @@ setup_5 = '\n'.join(' %s' % line for line in setup_.split('\n')) -import test.test_support -from test.test_support import verbose +try: + from test import support + from test.support import verbose +except ImportError: + from test import test_support as support + from test.test_support import verbose import random import re import sys @@ -539,13 +543,13 @@ class BoundedSemaphoreTests(lock_tests.BoundedSemaphoreTests): def main(): - test.test_support.run_unittest(LockTests, RLockTests, EventTests, - ConditionAsRLockTests, ConditionTests, - SemaphoreTests, BoundedSemaphoreTests, - ThreadTests, - ThreadJoinOnShutdown, - ThreadingExceptionTests, - ) + support.run_unittest(LockTests, RLockTests, EventTests, + ConditionAsRLockTests, ConditionTests, + SemaphoreTests, BoundedSemaphoreTests, + ThreadTests, + ThreadJoinOnShutdown, + ThreadingExceptionTests, + ) if __name__ == "__main__": main()