diff options
author | Ville Skyttä <ville.skytta@iki.fi> | 2016-10-10 18:21:03 +0300 |
---|---|---|
committer | Stefan Wójcik <wojcikstefan@gmail.com> | 2016-10-10 11:21:03 -0400 |
commit | 3a28e27ba16a2dedd9617ac2836352dd8b5683ea (patch) | |
tree | 3ffad863d2012460e212af5161cebbf3a1760af7 | |
parent | 17556a53b5657ac7d2eb4991509e89880b31ec1f (diff) | |
download | python-mimeparse-3a28e27ba16a2dedd9617ac2836352dd8b5683ea.tar.gz |
flake8 tweaks (#27)
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | mimeparse_test.py | 13 | ||||
-rwxr-xr-x | setup.py | 2 | ||||
-rw-r--r-- | tox.ini | 13 |
4 files changed, 16 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 20935de..f458847 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - TOXENV=py34 - TOXENV=pypy - TOXENV=pypy3 - - TOXENV=pep8,pyflakes + - TOXENV=flake8 # https://github.com/travis-ci/travis-ci/issues/4794 matrix: diff --git a/mimeparse_test.py b/mimeparse_test.py index 6d00238..da39312 100755 --- a/mimeparse_test.py +++ b/mimeparse_test.py @@ -6,9 +6,10 @@ This module loads a json file and converts the tests specified therein to a set of PyUnitTestCases. Then it uses PyUnit to run them and report their status. """ import json -import mimeparse import unittest +import mimeparse + __version__ = "0.1" __author__ = 'Ade Oshineye' @@ -36,15 +37,19 @@ class MimeParseTestCase(unittest.TestCase): def _test_best_match(self, args, expected, description): if expected is None: - self.assertRaises(mimeparse.MimeTypeParseException, mimeparse.best_match, args[0], args[1]) + self.assertRaises(mimeparse.MimeTypeParseException, + mimeparse.best_match, args[0], args[1]) else: result = mimeparse.best_match(args[0], args[1]) - message = "Expected: '%s' but got %s. Description for this test: %s" % (expected, result, description) + message = \ + "Expected: '%s' but got %s. Description for this test: %s" % \ + (expected, result, description) self.assertEqual(expected, result, message) def _test_parse_mime_type(self, args, expected): if expected is None: - self.assertRaises(mimeparse.MimeTypeParseException, mimeparse.parse_mime_type, args) + self.assertRaises(mimeparse.MimeTypeParseException, + mimeparse.parse_mime_type, args) else: expected = tuple(expected) result = mimeparse.parse_mime_type(args) @@ -1,7 +1,7 @@ #!/usr/bin/env python -import os import codecs +import os import re from setuptools import setup @@ -1,5 +1,5 @@ [tox] -envlist = py35,py34,py32,py27,pypy,pypy3,pep8,pyflakes +envlist = py35,py34,py32,py27,pypy,pypy3,flake8 [testenv] commands = ./mimeparse_test.py @@ -22,10 +22,7 @@ basepython = pypy [testenv:pypy3] basepython = pypy3 -[testenv:pep8] -deps = pep8 -commands = pep8 --statistics --show-source --ignore=E501 --exclude=.venv,.tox,*egg . - -[testenv:pyflakes] -deps = pyflakes -commands = pyflakes mimeparse.py mimeparse_test.py setup.py +[testenv:flake8] +deps = flake8 + flake8-import-order +commands = flake8 --statistics --show-source --ignore=E501 --exclude=.venv,.tox,*egg . |