Merge pull request #60 from allanlewis/pep8-typos-etc

Fix some typos and conform to PEP 8

Author: nicoddemus

pytest_flask/fixtures.py

@@ -6,8 +6,9 @@
 import socket
 
 try:
-    from urllib2 import urlopen
+    from urllib2 import URLError, urlopen
 except ImportError:
+    from urllib.error import URLError
     from urllib.request import urlopen
 
 from flask import _request_ctx_stack
@@ -34,7 +35,7 @@ def login(self, email, password):
                 return self.client.post(url_for('login'), data=credentials)
 
             def test_login(self):
-                assert self.login('vital@example.com', 'pass').status_code == 200
+                assert self.login('foo@example.com', 'pass').status_code == 200
 
     """
     if request.cls is not None:
@@ -72,7 +73,7 @@ def worker(app, port):
             try:
                 urlopen(self.url())
                 timeout = 0
-            except:
+            except URLError:
                 timeout -= 1
 
     def url(self, url=''):
@@ -100,7 +101,7 @@ def _rewrite_server_name(server_name, new_port):
 def live_server(request, app, monkeypatch):
     """Run application in a separate process.
 
-    When the ``live_server`` fixture is applyed, the ``url_for`` function
+    When the ``live_server`` fixture is applied, the ``url_for`` function
     works as expected::
 
         def test_server_is_up_and_running(live_server):

pytest_flask/plugin.py

@@ -79,7 +79,7 @@ def test_app(app, client):
     app = getfixturevalue(request, 'app')
 
     # Get application bound to the live server if ``live_server`` fixture
-    # is applyed. Live server application has an explicit ``SERVER_NAME``,
+    # is applied. Live server application has an explicit ``SERVER_NAME``,
     # so ``url_for`` function generates a complete URL for endpoint which
     # includes application port as well.
     if 'live_server' in request.fixturenames:
@@ -119,11 +119,11 @@ def pytest_addoption(parser):
     group.addoption('--start-live-server',
                     action="store_true", dest="start_live_server", default=True,
                     help="start server automatically when live_server "
-                         "fixture is applyed (enabled by default).")
+                         "fixture is applied (enabled by default).")
     group.addoption('--no-start-live-server',
                     action="store_false", dest="start_live_server",
                     help="don't start server automatically when live_server "
-                         "fixture is applyed.")
+                         "fixture is applied.")
 
 
 def pytest_configure(config):

tests/test_fixtures.py

@@ -23,7 +23,7 @@ def test_request_ctx(self, app, request_ctx):
         assert request_ctx.app is app
 
     def test_request_ctx_is_kept_around(self, client):
-        res = client.get(url_for('index'), headers=[('X-Something', '42')])
+        client.get(url_for('index'), headers=[('X-Something', '42')])
         assert request.headers['X-Something'] == '42'
 
 
@@ -37,7 +37,7 @@ def test_dont_rewrite_existing_implementation(self, app, accept_json):
         class MyResponse(app.response_class):
             @property
             def json(self):
-                '''What is the meaning of life, the universe and everything?'''
+                """What is the meaning of life, the universe and everything?"""
                 return 42
 
         app.response_class = MyResponse

tests/test_live_server.py

@@ -17,22 +17,26 @@ def test_server_is_alive(self, live_server):
 
     def test_server_url(self, live_server):
         assert live_server.url() == 'http://localhost:%d' % live_server.port
-        assert live_server.url('/ping') == 'http://localhost:%d/ping' % live_server.port
+        assert live_server.url('/ping') == \
+            'http://localhost:%d/ping' % live_server.port
 
     def test_server_listening(self, live_server):
         res = urlopen(live_server.url('/ping'))
         assert res.code == 200
         assert b'pong' in res.read()
 
     def test_url_for(self, live_server):
-        assert url_for('ping', _external=True) == 'http://localhost:%s/ping' % live_server.port
+        assert url_for('ping', _external=True) == \
+            'http://localhost:%s/ping' % live_server.port
 
     def test_set_application_server_name(self, live_server):
-        assert live_server.app.config['SERVER_NAME'] == 'localhost:%d' % live_server.port
+        assert live_server.app.config['SERVER_NAME'] == \
+            'localhost:%d' % live_server.port
 
     @pytest.mark.options(server_name='example.com:5000')
     def test_rewrite_application_server_name(self, live_server):
-        assert live_server.app.config['SERVER_NAME'] == 'example.com:%d' % live_server.port
+        assert live_server.app.config['SERVER_NAME'] == \
+            'example.com:%d' % live_server.port
 
     def test_prevent_starting_live_server(self, appdir):
         appdir.create_test_module('''