Merge remote-tracking branch 'upstream/master'

tests/fixtures.py

@@ -38,4 +38,3 @@ with open(BIN_FILE_PATH, 'rb') as f:
     BIN_FILE_CONTENT = f.read()
 
 UNICODE = FILE_CONTENT
-

tests/test_auth.py

@@ -60,4 +60,3 @@ class TestAuth:
         assert args.auth
         assert args.auth.key == 'username'
         assert args.auth.value == ''
-

tests/test_docs.py

@@ -9,7 +9,7 @@ from utils import TESTS_ROOT
 
 def has_docutils():
     try:
-        #noinspection PyUnresolvedReferences
+        # noinspection PyUnresolvedReferences
         import docutils
         return True
     except ImportError:
@@ -32,8 +32,8 @@ assert filenames
 def test_rst_file_syntax(filename):
     p = subprocess.Popen(
         ['rst2pseudoxml.py', '--report=1', '--exit-status=1', filename],
-         stderr=subprocess.PIPE,
-         stdout=subprocess.PIPE
+        stderr=subprocess.PIPE,
+        stdout=subprocess.PIPE
     )
     err = p.communicate()[1]
     assert p.returncode == 0, err

tests/test_sessions.py

@@ -64,17 +64,20 @@ class TestSessionFlow(SessionTestBase):
     def test_session_update(self, httpbin):
         self.start_session(httpbin)
         # Get a response to a request from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r2
 
         # Make a request modifying the session data.
         r3 = http('--follow', '--session=test', '--auth=username:password2',
-                  'GET', httpbin.url + '/cookies/set?hello=world2', 'Hello:World2',
+                  'GET', httpbin.url + '/cookies/set?hello=world2',
+                  'Hello:World2',
                   env=self.env())
         assert HTTP_OK in r3
 
         # Get a response to a request from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r4
         assert r4.json['headers']['Hello'] == 'World2'
         assert r4.json['headers']['Cookie'] == 'hello=world2'
@@ -84,7 +87,8 @@ class TestSessionFlow(SessionTestBase):
     def test_session_read_only(self, httpbin):
         self.start_session(httpbin)
         # Get a response from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r2
 
         # Make a request modifying the session data but
@@ -96,7 +100,8 @@ class TestSessionFlow(SessionTestBase):
         assert HTTP_OK in r3
 
         # Get a response from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r4
 
         # Origin can differ on Travis.
@@ -117,8 +122,8 @@ class TestSession(SessionTestBase):
                   'If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT',
                   env=self.env())
         assert HTTP_OK in r1
-
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r2
         assert no_content_type(r2.json['headers'])
         assert 'If-Unmodified-Since' not in r2.json['headers']

tests/test_uploads.py

@@ -30,7 +30,7 @@ class TestMultipartFormDataFileUpload:
                  'test-file@%s' % FILE_PATH_ARG)
         assert HTTP_OK in r
         assert r.count('Content-Disposition: form-data; name="test-file";'
-               ' filename="%s"' % os.path.basename(FILE_PATH)) == 2
+                       ' filename="%s"' % os.path.basename(FILE_PATH)) == 2
         # Should be 4, but is 3 because httpbin
         # doesn't seem to support filed field lists
         assert r.count(FILE_CONTENT) in [3, 4]

tests/utils.py

@@ -53,7 +53,7 @@ class TestEnvironment(Environment):
     stdout_isatty = True
     is_windows = False
 
-    _shutil = shutil  # needed by __del__ (would get gc'd)
+    _shutil_rmtree = shutil.rmtree  # needed by __del__ (would get gc'd)
 
     def __init__(self, **kwargs):
 
@@ -72,7 +72,7 @@ class TestEnvironment(Environment):
 
     def __del__(self):
         if self.delete_config_dir:
-            self._shutil.rmtree(self.config_dir)
+            self._shutil_rmtree(self.config_dir)
 
 
 def http(*args, **kwargs):