Fix lint issue and review comments

Jon Wayne Parrott · Jon Wayne Parrott · commit b8792d9164f6 · 2016-08-18T10:11:16.000-07:00
Change-Id: I02a53961b6411247ef06d84dad7b533cb97d89f7
diff --git a/appengine/standard/conftest.py b/appengine/standard/conftest.py
@@ -14,16 +14,14 @@
 
 import os
 
-import six
-
-
 # Import py.test hooks and fixtures for App Engine
 from gcp.testing.appengine import (
     login,
     pytest_configure,
     pytest_runtest_call,
     run_tasks,
     testbed)
+import six
 
 (login)
 (pytest_configure)
@@ -33,7 +31,7 @@
 
 
 def pytest_ignore_collect(path, config):
-    """Skip App Engine tests in python 3 and if no SDK is available."""
+    """Skip App Engine tests in python 3 or if no SDK is available."""
     if 'appengine/standard' in str(path):
         if six.PY3:
             return True
