Fix flake8 issues

omgjlk · omgjlk · commit 0a2010c49d56 · 2017-12-13T20:39:52.000-08:00
Ran into these in an unrelated PR.

Don't have a bare except

Don't use single char variables

Also cap pytest at below 3.3.0, which drops support for py33 (we could
drop py33 support as well)

Signed-off-by: Jesse Keating &lt;jkeating@j2solutions.net&gt;
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,7 +1,7 @@
 .
 #coverage==3.5.2
 mock==1.0.1
-pytest>=2.3.5
+pytest>=2.3.5,<3.3.0
 wheel==0.21.0
 betamax>=0.5.0
 betamax_matchers>=0.2.0
diff --git a/github3/exceptions.py b/github3/exceptions.py
@@ -18,7 +18,7 @@ def __init__(self, resp):
             #: List of errors provided by GitHub
             if error.get('errors'):
                 self.errors = error.get('errors')
-        except:  # Amazon S3 error
+        except Exception:  # Amazon S3 error
             self.msg = resp.content or '[No message]'
 
     def __repr__(self):
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     'pyasn1'
 ]
 
-kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest',
+kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest <3.3.0',
                            'betamax-matchers>=0.1.0']
 if sys.version_info < (3, 0):
     kwargs['tests_require'].append('unittest2 ==0.5.1')
diff --git a/tests/integration/test_github.py b/tests/integration/test_github.py
@@ -216,10 +216,10 @@ def test_gitignore_templates(self):
         """Test the ability to retrieve a list of gitignore templates."""
         cassette_name = self.cassette_name('gitignore_templates')
         with self.recorder.use_cassette(cassette_name):
-            l = self.gh.gitignore_templates()
+            thelist = self.gh.gitignore_templates()
 
-        assert l != []
-        assert isinstance(l, list)
+        assert thelist != []
+        assert isinstance(thelist, list)
 
     def test_is_following(self):
         """Test the ability to check if a user is being followed."""
diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,7 @@ pip_pre = False
 deps =
     requests{env:REQUESTS_VERSION:>=2.0}
     mock==1.0.1
-    pytest>=2.3.5
+    pytest>=2.3.5,<3.3.0
     betamax>=0.5.1
     betamax_matchers>=0.3.0
     pypy,py27: unittest2

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`.`
`2`	`2`	`#coverage==3.5.2`
`3`	`3`	`mock==1.0.1`
`4`		`-pytest>=2.3.5`
	`4`	`+pytest>=2.3.5,<3.3.0`
`5`	`5`	`wheel==0.21.0`
`6`	`6`	`betamax>=0.5.0`
`7`	`7`	`betamax_matchers>=0.2.0`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`'pyasn1'`
`24`	`24`	`]`
`25`	`25`
`26`		`-kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest',`
	`26`	`+kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest <3.3.0',`
`27`	`27`	`'betamax-matchers>=0.1.0']`
`28`	`28`	`if sys.version_info < (3, 0):`
`29`	`29`	`kwargs['tests_require'].append('unittest2 ==0.5.1')`