Skip to content

Commit 67971ec

Browse files
committed
Update a couple of tests to use install_aliases() instead of install_hooks()
1 parent d92f3d5 commit 67971ec

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

tests/test_future/test_futurize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ def test_urllib_refactor(self):
632632
"""
633633
after = """
634634
from future import standard_library
635-
standard_library.install_hooks()
635+
standard_library.install_aliases()
636636
import urllib.request
637637
638638
URL = 'http://pypi.python.org/pypi/future/json'
@@ -1263,7 +1263,7 @@ def test_all_imports(self):
12631263
from __future__ import division
12641264
from __future__ import absolute_import
12651265
from future import standard_library
1266-
standard_library.install_hooks()
1266+
standard_library.install_aliases()
12671267
from builtins import range
12681268
from builtins import *
12691269
import math

tests/test_future/test_standard_library.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ class TestStandardLibraryReorganization(CodeHandler):
1919

2020
def setUp(self):
2121
self.interpreter = sys.executable
22-
standard_library.install_hooks()
22+
standard_library.install_aliases()
2323
super(TestStandardLibraryReorganization, self).setUp()
2424

2525
def tearDown(self):
26-
standard_library.remove_hooks()
26+
# standard_library.remove_hooks()
27+
pass
2728

2829
def test_can_import_several(self):
2930
"""
@@ -37,8 +38,7 @@ def test_can_import_several(self):
3738
import future.moves.urllib.parse as urllib_parse
3839
import future.moves.urllib.request as urllib_request
3940

40-
with standard_library.hooks():
41-
import http.server
41+
import http.server
4242
for m in [urllib_parse, urllib_request, http.server]:
4343
self.assertTrue(m is not None)
4444

@@ -369,6 +369,17 @@ def test_urllib_imports_moves(self):
369369
import future.moves.urllib.response
370370
self.assertTrue(True)
371371

372+
def test_urllib_imports_install_aliases(self):
373+
with standard_library.suspend_hooks():
374+
standard_library.install_aliases()
375+
import urllib
376+
import urllib.parse
377+
import urllib.request
378+
import urllib.robotparser
379+
import urllib.error
380+
import urllib.response
381+
self.assertTrue(True)
382+
372383
def test_urllib_imports_cm(self):
373384
with standard_library.hooks():
374385
import urllib

0 commit comments

Comments
 (0)