Permalink
Browse files

Add importlib to requirements.txt and a couple of other test tidy-ups

  • Loading branch information...
1 parent c05d809 commit 438667ec103b71c3cc2e668a53c32e36c3c78734 @edschofield edschofield committed Jan 28, 2014
Showing with 10 additions and 8 deletions.
  1. +7 −7 future/tests/test_httpservers.py
  2. +2 −1 future/tests/test_import_star.py
  3. +1 −0 requirements_py26.txt
@@ -13,9 +13,13 @@
from future.builtins import *
from future import standard_library, utils
-from http.server import BaseHTTPRequestHandler, HTTPServer, \
- SimpleHTTPRequestHandler, CGIHTTPRequestHandler
-from http import server
+
+with standard_library.hooks():
+ from http.server import BaseHTTPRequestHandler, HTTPServer, \
+ SimpleHTTPRequestHandler, CGIHTTPRequestHandler
+ from http import server
+ import http.client
+ from test import support
import os
import sys
@@ -27,10 +31,6 @@
# Use this instead:
import urllib
-with standard_library.hooks():
- import http.client
- from test import support
-
import tempfile
from io import BytesIO
@@ -15,7 +15,7 @@
import copy
from future import utils
-from future.tests.base import unittest
+from future.tests.base import unittest, skip26
original_locals = set(copy.copy(locals()))
@@ -48,6 +48,7 @@ def test_iterators(self):
def test_super(self):
pass
+ @skip26
@unittest.expectedFailure
def test_python3_stdlib_imports(self):
"""
@@ -1,3 +1,4 @@
unittest2
argparse # for the http.server module
+importlib

0 comments on commit 438667e

Please sign in to comment.