Fix pyflakes and pep8 errors

Use extra asserts to use previously unused variables in tests,
such as `cass` and `response`.

Fix only pyflakes errors in docs/conf.py

vcr/matchers.py

@@ -67,7 +67,8 @@ def _identity(x):
 
 def _get_transformer(request):
     for checker, transformer in _checker_transformer_pairs:
-        if checker(request.headers): return transformer
+        if checker(request.headers):
+            return transformer
     else:
         return _identity
 

vcr/migration.py

@@ -19,7 +19,7 @@ import sys
 import tempfile
 import yaml
 
-from .serializers import compat, yamlserializer, jsonserializer
+from .serializers import yamlserializer, jsonserializer
 from .serialize import serialize
 from . import request
 from .stubs.compat import get_httpmessage

vcr/patch.py

@@ -59,7 +59,7 @@ except ImportError:  # pragma: no cover
     pass
 else:
     _SimpleAsyncHTTPClient_fetch_impl = \
-            tornado.simple_httpclient.SimpleAsyncHTTPClient.fetch_impl
+        tornado.simple_httpclient.SimpleAsyncHTTPClient.fetch_impl
 
 
 try:
@@ -68,7 +68,7 @@ except ImportError:  # pragma: no cover
     pass
 else:
     _CurlAsyncHTTPClient_fetch_impl = \
-            tornado.curl_httpclient.CurlAsyncHTTPClient.fetch_impl
+        tornado.curl_httpclient.CurlAsyncHTTPClient.fetch_impl
 
 
 class CassettePatcherBuilder(object):
@@ -127,13 +127,13 @@ class CassettePatcherBuilder(object):
         described in the previous paragraph.
         """
         if isinstance(replacement_dict_or_obj, dict):
-            for key, replacement_obj  in replacement_dict_or_obj.items():
+            for key, replacement_obj in replacement_dict_or_obj.items():
                 replacement_obj = self._recursively_apply_get_cassette_subclass(
                     replacement_obj)
                 replacement_dict_or_obj[key] = replacement_obj
             return replacement_dict_or_obj
         if hasattr(replacement_dict_or_obj, 'cassette'):
-            replacement_dict_or_obj =  self._get_cassette_subclass(
+            replacement_dict_or_obj = self._get_cassette_subclass(
                 replacement_dict_or_obj)
         return replacement_dict_or_obj
 
@@ -147,7 +147,7 @@ class CassettePatcherBuilder(object):
 
     def _build_cassette_subclass(self, base_class):
         bases = (base_class,)
-        if not issubclass(base_class, object): # Check for old style class
+        if not issubclass(base_class, object):  # Check for old style class
             bases += (object,)
         return type('{0}{1}'.format(base_class.__name__, self._cassette._path),
                     bases, dict(cassette=self._cassette))
@@ -167,11 +167,13 @@ class CassettePatcherBuilder(object):
 
     def _patched_get_conn(self, connection_pool_class, connection_class_getter):
         get_conn = connection_pool_class._get_conn
+
         @functools.wraps(get_conn)
         def patched_get_conn(pool, timeout=None):
             connection = get_conn(pool, timeout)
-            connection_class = pool.ConnectionCls if hasattr(pool, 'ConnectionCls') \
-                               else connection_class_getter()
+            connection_class = (
+                pool.ConnectionCls if hasattr(pool, 'ConnectionCls')
+                else connection_class_getter())
             # We need to make sure that we are actually providing a
             # patched version of the connection class. This might not
             # always be the case because the pool keeps previously
@@ -181,15 +183,18 @@ class CassettePatcherBuilder(object):
             while not isinstance(connection, connection_class):
                 connection = get_conn(pool, timeout)
             return connection
+
         return patched_get_conn
 
     def _patched_new_conn(self, connection_pool_class, connection_remover):
         new_conn = connection_pool_class._new_conn
+
         @functools.wraps(new_conn)
         def patched_new_conn(pool):
             new_connection = new_conn(pool)
             connection_remover.add_connection_to_pool_entry(pool, new_connection)
             return new_connection
+
         return patched_new_conn
 
     def _urllib3(self):
@@ -270,10 +275,10 @@ class CassettePatcherBuilder(object):
         # connections of the appropriate type.
         mock_triples += ((cpool.HTTPConnectionPool, '_get_conn',
                           self._patched_get_conn(cpool.HTTPConnectionPool,
-                                                 lambda : cpool.HTTPConnection)),
+                                                 lambda: cpool.HTTPConnection)),
                          (cpool.HTTPSConnectionPool, '_get_conn',
                           self._patched_get_conn(cpool.HTTPSConnectionPool,
-                                                 lambda : cpool.HTTPSConnection)),
+                                                 lambda: cpool.HTTPSConnection)),
                          (cpool.HTTPConnectionPool, '_new_conn',
                           self._patched_new_conn(cpool.HTTPConnectionPool,
                                                  http_connection_remover)),
@@ -382,7 +387,7 @@ def reset_patchers():
     else:
         yield mock.patch.object(
             curl.CurlAsyncHTTPClient,
-            'fetch_impl', 
+            'fetch_impl',
             _CurlAsyncHTTPClient_fetch_impl,
         )
 

vcr/stubs/__init__.py

@@ -1,9 +1,5 @@
 '''Stubs for patching HTTP and HTTPS requests'''
 
-try:
-    import http.client
-except ImportError:
-    pass
 import logging
 import six
 from six.moves.http_client import (
@@ -329,8 +325,8 @@ class VCRConnection(object):
         try:
             setattr(self.real_connection, name, value)
         except AttributeError:
-             # raised if real_connection has not been set yet, such as when
-             # we're setting the real_connection itself for the first time
+            # raised if real_connection has not been set yet, such as when
+            # we're setting the real_connection itself for the first time
             pass
 
         super(VCRConnection, self).__setattr__(name, value)

vcr/stubs/requests_stubs.py

@@ -10,8 +10,10 @@ from ..stubs import VCRHTTPConnection, VCRHTTPSConnection
 # urllib3 defines its own HTTPConnection classes, which requests goes ahead and assumes
 # you're using.  It includes some polyfills for newer features missing in older pythons.
 
+
 class VCRRequestsHTTPConnection(VCRHTTPConnection, HTTPConnection):
     _baseclass = HTTPConnection
 
+
 class VCRRequestsHTTPSConnection(VCRHTTPSConnection, VerifiedHTTPSConnection):
     _baseclass = VerifiedHTTPSConnection

vcr/stubs/urllib3_stubs.py

@@ -6,8 +6,10 @@ from ..stubs import VCRHTTPConnection, VCRHTTPSConnection
 # urllib3 defines its own HTTPConnection classes. It includes some polyfills
 # for newer features missing in older pythons.
 
+
 class VCRRequestsHTTPConnection(VCRHTTPConnection, HTTPConnection):
     _baseclass = HTTPConnection
 
+
 class VCRRequestsHTTPSConnection(VCRHTTPSConnection, VerifiedHTTPSConnection):
     _baseclass = VerifiedHTTPSConnection

vcr/util.py

@@ -71,6 +71,7 @@ class CaseInsensitiveDict(collections.MutableMapping):
     def __repr__(self):
         return str(dict(self.items()))
 
+
 def partition_dict(predicate, dictionary):
     true_dict = {}
     false_dict = {}
@@ -89,6 +90,7 @@ def compose(*functions):
         return res
     return composed
 
+
 def read_body(request):
     if hasattr(request.body, 'read'):
         return request.body.read()