8000 Fix more imports · TrendingTechnology/python-future@51b47e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 51b47e9

Browse files
edschofieldedschofield
committed
Fix more imports
1 parent e01f8a6 commit 51b47e9

File tree

5 files changed

+41
-39
lines changed

5 files changed

+41
-39
lines changed

‎future/tests/test_email/test_pickleable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import future.standard_library.email.message as email_message
1010
from future.standard_library.email import policy
1111
from future.standard_library.email.headerregistry import HeaderRegistry
12-
from future.test.test_email import TestEmailBase, parameterize
12+
from future.tests.test_email import TestEmailBase, parameterize
1313
from future.tests.base import unittest
1414
from future.builtins import str
1515

‎future/tests/test_email/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import time
77
import sys
88
from future.standard_library.email import utils
9-
from future.test import support as test_support
9+
from future.standard_library import support as test_support
1010
from future.tests.base import unittest
1111

1212

‎future/tests/test_urllib2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ def test___all__(self):
2626
# Verify which names are exposed
2727
for module in 'request', 'response', 'parse', 'error', 'robotparser':
2828
context = {}
29-
exec('from urllib.%s import *' % module, context)
29+
exec('from future.standard_library.urllib.%s import *' % module, context)
3030
del context['__builtins__']
3131
if module == 'request' and os.name == 'nt':
3232
u, p = context.pop('url2pathname'), context.pop('pathname2url')
3333
self.assertEqual(u.__module__, 'nturl2path')
3434
self.assertEqual(p.__module__, 'nturl2path')
3535
for k, v in context.items():
36-
self.assertEqual(v.__module__, 'urllib.%s' % module,
37-
"%r is exposed in 'urllib.%s' but defined in %r" %
36+
self.assertEqual(v.__module__, 'future.standard_library.urllib.%s' % module,
37+
"%r is exposed in 'future.standard_library.urllib.%s' but defined in %r" %
3838
(k, module, v.__module__))
3939

4040
def test_trivial(self):

‎future/tests/test_urllib2_localnet.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import future.standard_library.email as email
1212
import future.standard_library.urllib.parse as urllib_parse
1313
import future.standard_library.urllib.request as urllib_request
14+
import future.standard_library.urllib.error as urllib_error
1415
from future.tests.base import unittest
1516
from future.builtins import bytes, int, str, super
1617
from future.standard_library.test import support
@@ -270,13 +271,13 @@ def test_proxy_with_bad_password_raises_httperror(self):
270271
self.proxy_digest_handler.add_password(self.REALM, self.URL,
271272
self.USER, self.PASSWD+"bad")
272273
self.digest_auth_handler.set_qop("auth")
273-
self.assertRaises(urllib.error.HTTPError,
274+
self.assertRaises(urllib_error.HTTPError,
274275
self.opener.open,
275276
self.URL)
276277

277278
def test_proxy_with_no_password_raises_httperror(self):
278279
self.digest_auth_handler.set_qop("auth")
279-
self.assertRaises(urllib.error.HTTPError,
280+
self.assertRaises(urllib_error.HTTPError,
280281
self.opener.open,
 10000
281282
self.URL)
282283

@@ -295,7 +296,7 @@ def test_proxy_qop_auth_int_works_or_throws_urlerror(self):
295296
self.digest_auth_handler.set_qop("auth-int")
296297
try:
297298
result = self.opener.open(self.URL)
298-
except urllib.error.URLError:
299+
except urllib_error.URLError:
299300
# It's okay if we don't support auth-int, but we certainly
300301
# shouldn't receive any kind of exception here other than
301302
# a URLError.
@@ -442,7 +443,7 @@ def test_404(self):
442443

443444
try:
444445
self.urlopen("http://localhost:%s/weeble" % handler.port)
445-
except urllib.error.URLError as f:
446+
except urllib_error.URLError as f:
446447
data = f.read()
447448
f.close()
448449
else:
@@ -481,7 +482,7 @@ def test_https_with_cafile(self):
481482
cafile=CERT_localhost)
482483
self.assertEqual(data, b"we care a bit")
483484
# Bad cert
484-
with self.assertRaises(urllib.error.URLError) as cm:
485+
with self.assertRaises(urllib_error.URLError) as cm:
485486
self.urlopen("https://localhost:%s/bizarre" % handler.port,
486487
cafile=CERT_fakehostname)
487488
# Good cert, but mismatching hostname
@@ -494,7 +495,7 @@ def test_https_with_cafile(self):
494495
def test_https_with_cadefault(self):
495496
handler = self.start_https_server(certfile=CERT_localhost)
496497
# Self-signed cert should fail verification with system certificate store
497-
with self.assertRaises(urllib.error.URLError) as cm:
498+
with self.assertRaises(urllib_error.URLError) as cm:
498499
self.urlopen("https://localhost:%s/bizarre" % handler.port,
499500
cadefault=True)
500501

‎future/tests/test_xmlrpc.py

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import sys
77
import time
88
from future.tests.base import unittest
9-
import future.standard_library.xmlrpc.client as xmlrpclib
10-
import future.standard_library.xmlrpc.server as xmlrpc_server
119
from future.standard_library.test import support
1210
with standard_library.hooks():
1311
import http.client
12+
import xmlrpc.client as xmlrpclib
13+
import xmlrpc.client # this crazy module refers to it under both names
14+
import xmlrpc.server
1415
import socket
1516
import os
1617
import re
@@ -253,8 +254,8 @@ def test_dotted_attribute(self):
253254
# this will raise AttributeError because code don't want us to use
254255
# private methods
255256
self.assertRaises(AttributeError,
256-
xmlrpc_server.resolve_dotted_attribute, str, '__add')
257-
self.assertTrue(xmlrpc_server.resolve_dotted_attribute(str, 'title'))
257+
xmlrpc.server.resolve_dotted_attribute, str, '__add')
258+
self.assertTrue(xmlrpc.server.resolve_dotted_attribute(str, 'title'))
258259

259260
class DateTimeTestCase(unittest.TestCase):
260261
@unittest.skipIf(mock is None, "this test requires the mock library")
@@ -389,7 +390,7 @@ def my_function():
389390
'''This is my function'''
390391
return True
391392

392-
class MyXMLRPCServer(xmlrpc_server.SimpleXMLRPCServer):
393+
class MyXMLRPCServer(xmlrpc.server.SimpleXMLRPCServer):
393394
def get_request(self):
394395
# Ensure the socket is always non-blocking. On Linux, socket
395396
# attributes are not inherited like they are on *BSD and Windows.
@@ -398,7 +399,7 @@ def get_request(self):
398399
return s, port
399400

400401
if not requestHandler:
401-
requestHandler = xmlrpc_server.SimpleXMLRPCRequestHandler
402+
requestHandler = xmlrpc.server.SimpleXMLRPCRequestHandler
402403
serv = MyXMLRPCServer(("localhost", 0), requestHandler,
403404
logRequests=False, bind_and_activate=False)
404405
try:
@@ -444,7 +445,7 @@ def my_function():
444445
'''This is my function'''
445446
return True
446447

447-
class MyXMLRPCServer(xmlrpc_server.MultiPathXMLRPCServer):
448+
class MyXMLRPCServer(xmlrpc.server.MultiPathXMLRPCServer):
448449
def get_request(self):
449450
# Ensure the socket is always non-blocking. On Linux, socket
450451
# attributes are not inherited like they are on *BSD and Windows.
@@ -453,7 +454,7 @@ def get_request(self):
453454
return s, port
454455

455456
if not requestHandler:
456-
requestHandler = xmlrpc_server.SimpleXMLRPCRequestHandler
457+
requestHandler = xmlrpc.server.SimpleXMLRPCRequestHandler
457458
class MyRequestHandler(requestHandler):
458459
rpc_paths = []
459460

@@ -476,7 +477,7 @@ def _marshaled_dispatch(self, data, dispatch_method=None, path=None):
476477
serv.server_activate()
477478
paths = ["/foo", "/foo/bar"]
478479
for path in paths:
479-
d = serv.add_dispatcher(path, xmlrpc_server.SimpleXMLRPCDispatcher())
480+
d = serv.add_dispatcher(path, xmlrpc.server.SimpleXMLRPCDispatcher())
480481
d.register_introspection_functions()
481482
d.register_multicall_functions()
482483
serv.get_dispatcher(paths[0]).register_function(pow)
@@ -539,7 +540,7 @@ class BaseServerTestCase(unittest.TestCase):
539540

540541
def setUp(self):
541542
# enable traceback reporting
542-
xmlrpc_server.SimpleXMLRPCServer._send_traceback_header = True
543+
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = True
543544

544545
self.evt = threading.Event()
545546
# start server thread to handle requests
@@ -555,7 +556,7 @@ def tearDown(self):
555556
self.evt.wait()
556557

557558
# disable traceback reporting
558-
xmlrpc_server.SimpleXMLRPCServer._send_traceback_header = False
559+
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = False
559560

560561
class SimpleServerTestCase(BaseServerTestCase):
561562
def test_simple1(self):
@@ -688,9 +689,9 @@ def test_non_existing_multicall(self):
688689
def test_dotted_attribute(self):
689690
# Raises an AttributeError because private methods are not allowed.
690691
self.assertRaises(AttributeError,
691-
xmlrpc_server.resolve_dotted_attribute, str, '__add')
692+
xmlrpc.server.resolve_dotted_attribute, str, '__add')
692693

693-
self.assertTrue(xmlrpc_server.resolve_dotted_attribute(str, 'title'))
694+
self.assertTrue(xmlrpc.server.resolve_dotted_attribute(str, 'title'))
694695
# Get the test to run faster by sending a request with test_simple1.
695696
# This avoids waiting for the socket timeout.
696697
self.test_simple1()
@@ -728,8 +729,8 @@ def test_path3(self):
728729
class BaseKeepaliveServerTestCase(BaseServerTestCase):
729730
#a request handler that supports keep-alive and logs requests into a
730731
#class variable
731-
class RequestHandler(xmlrpc_server.SimpleXMLRPCRequestHandler):
732-
parentClass = xmlrpc_server.SimpleXMLRPCRequestHandler
732+
class RequestHandler(xmlrpc.server.SimpleXMLRPCRequestHandler):
733+
parentClass = xmlrpc.server.SimpleXMLRPCRequestHandler
733734
protocol_version = 'HTTP/1.1'
734735
myRequests = []
735736
def handle(self):
@@ -807,8 +808,8 @@ def test_transport(self):
807808
class GzipServerTestCase(BaseServerTestCase):
808809
#a request handler that supports keep-alive and logs requests into a
809810
#class variable
810-
class RequestHandler(xmlrpc_server.SimpleXMLRPCRequestHandler):
811-
parentClass = xmlrpc_server.SimpleXMLRPCRequestHandler
811+
class RequestHandler(xmlrpc.server.SimpleXMLRPCRequestHandler):
812+
parentClass = xmlrpc.server.SimpleXMLRPCRequestHandler
812813
protocol_version = 'HTTP/1.1'
813814

814815
def do_POST(self):
@@ -917,18 +918,18 @@ def tearDown(self):
917918
# wait on the server thread to terminate
918919
self.evt.wait()
919920
# reset flag
920-
xmlrpc_server.SimpleXMLRPCServer._send_traceback_header = False
921+
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = False
921922
# reset message class
922923
default_class = http.client.HTTPMessage
923-
xmlrpc_server.SimpleXMLRPCRequestHandler.MessageClass = default_class
924+
xmlrpc.server.SimpleXMLRPCRequestHandler.MessageClass = default_class
924925

925926
def test_basic(self):
926927
# check that flag is false by default
927-
flagval = xmlrpc_server.SimpleXMLRPCServer._send_traceback_header
928+
flagval = xmlrpc.server.SimpleXMLRPCServer._send_traceback_header
928929
self.assertEqual(flagval, False)
929930

930931
# enable traceback reporting
931-
xmlrpc_server.SimpleXMLRPCServer._send_traceback_header = True
932+
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = True
932933

933934
# test a call that shouldn't fail just as a smoke test
934935
try:
@@ -942,7 +943,7 @@ def test_basic(self):
942943

943944
def test_fail_no_info(self):
944945
# use the broken message class
945-
xmlrpc_server.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
946+
xmlrpc.server.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
946947

947948
try:
948949
p = xmlrpclib.ServerProxy(URL)
@@ -958,11 +959,11 @@ def test_fail_no_info(self):
958959

959960
def test_fail_with_info(self):
960961
# use the broken message class
961-
xmlrpc_server.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
962+
xmlrpc.server.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
962963

963964
# Check that errors in the server send back exception/traceback
964965
# info when flag is set
965-
xmlrpc_server.SimpleXMLRPCServer._send_traceback_header = True
966+
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = True
966967

967968
try:
968969
p = xmlrpclib.ServerProxy(URL)
@@ -994,7 +995,7 @@ def captured_stdout(encoding='utf-8'):
994995

995996
class CGIHandlerTestCase(unittest.TestCase):
996997
def setUp(self):
997-
self.cgi = xmlrpc_server.CGIXMLRPCRequestHandler()
998+
self.cgi = xmlrpc.server.CGIXMLRPCRequestHandler()
998999

9991000
def tearDown(self):
10001001
self.cgi = None
@@ -1072,7 +1073,7 @@ def test_use_builtin_types(self):
10721073
marshaled = xmlrpclib.dumps((expected_bytes, expected_date), 'foobar')
10731074
def foobar(*args):
10741075
self.log.extend(args)
1075-
handler = xmlrpc_server.SimpleXMLRPCDispatcher(
1076+
handler = xmlrpc.server.SimpleXMLRPCDispatcher(
10761077
allow_none=True, encoding=None, use_builtin_types=True)
10771078
handler.register_function(foobar)
10781079
handler._marshaled_dispatch(marshaled)
@@ -1083,11 +1084,11 @@ def foobar(*args):
10831084
self.assertIs(type(mybytes), bytes)
10841085

10851086
def test_cgihandler_has_use_builtin_types_flag(self):
1086-
handler = xmlrpc_server.CGIXMLRPCRequestHandler(use_builtin_types=True)
1087+
handler = xmlrpc.server.CGIXMLRPCRequestHandler(use_builtin_types=True)
10871088
self.assertTrue(handler.use_builtin_types)
10881089

10891090
def test_xmlrpcserver_has_use_builtin_types_flag(self):
1090-
server = xmlrpc_server.SimpleXMLRPCServer(("localhost", 0),
1091+
server = xmlrpc.server.SimpleXMLRPCServer(("localhost", 0),
10911092
use_builtin_types=True)
10921093
server.server_close()
10931094
self.assertTrue(server.use_builtin_types)

0 commit comments

Comments
 (0)
0