Merge pull request #267 from pylast/pep8-naming

Add pep8-naming to flake8 and fix issues

pylast/__init__.py

@@ -108,6 +108,9 @@ SCROBBLE_MODE_LOVED = "L"
 SCROBBLE_MODE_BANNED = "B"
 SCROBBLE_MODE_SKIPPED = "S"
 
+# Delay time in seconds from section 4.4 of https://www.last.fm/api/tos
+DELAY_TIME = 0.2
+
 # Python >3.4 and >2.7.9 has sane defaults
 SSL_CONTEXT = ssl.create_default_context()
 
@@ -254,9 +257,6 @@ class _Network(object):
         """
             Makes sure that web service calls are at least 0.2 seconds apart.
         """
-
-        # Delay time in seconds from section 4.4 of https://www.last.fm/api/tos
-        DELAY_TIME = 0.2
         now = time.time()
 
         time_since_last = now - self.last_call_time

tests/test_pylast.py

@@ -54,11 +54,11 @@ class TestPyLastWithLastFm(PyLastTestCase):
         self.username = self.__class__.secrets["username"]
         password_hash = self.__class__.secrets["password_hash"]
 
-        API_KEY = self.__class__.secrets["api_key"]
-        API_SECRET = self.__class__.secrets["api_secret"]
+        api_key = self.__class__.secrets["api_key"]
+        api_secret = self.__class__.secrets["api_secret"]
 
         self.network = pylast.LastFMNetwork(
-            api_key=API_KEY, api_secret=API_SECRET,
+            api_key=api_key, api_secret=api_secret,
             username=self.username, password_hash=password_hash)
 
     def helper_is_thing_hashable(self, thing):

tox.ini

@@ -25,13 +25,10 @@ commands = {posargs}
 
 [testenv:lint]
 deps =
-     pycodestyle
-     pyflakes
+    flake8
+    pep8-naming
 commands =
-    pyflakes pylast
-    pyflakes tests
-    pycodestyle pylast
-    pycodestyle tests
+    flake8 .
 
 [testenv:py2lint]
 deps =