Fixed ``has_key()`` which is deprecated in python3.

Also cleaned up several PEP8 warnings.

1 files changed, 11 insertions, 7 deletions

diff --git a/mimeparse_test.py b/mimeparse_test.py
index 4b4f95e..ce639e4 100755
--- a/mimeparse_test.py
+++ b/mimeparse_test.py
@@ -10,14 +10,11 @@ __author__ = 'Ade Oshineye'
 __email__ = "ade@oshineye.com"
 __credits__ = ""
 
+import json
 import mimeparse
 import unittest
 from functools import partial
-# Conditional import to support Python 2.5
-try:
-    import json
-except ImportError:
-    import simplejson as json
+
 
 def test_parse_media_range(args, expected):
     expected = tuple(expected)
@@ -25,33 +22,39 @@ def test_parse_media_range(args, expected):
     message = "Expected: '%s' but got %s" % (expected, result)
     assert expected == result, message
 
+
 def test_quality(args, expected):
     result = mimeparse.quality(args[0], args[1])
     message = "Expected: '%s' but got %s" % (expected, result)
     assert expected == result, message
 
+
 def test_best_match(args, expected):
     result = mimeparse.best_match(args[0], args[1])
     message = "Expected: '%s' but got %s" % (expected, result)
     assert expected == result, message
 
+
 def test_parse_mime_type(args, expected):
     expected = tuple(expected)
     result = mimeparse.parse_mime_type(args)
     message = "Expected: '%s' but got %s" % (expected, result)
     assert expected == result, message
 
+
 def add_tests(suite, json_object, func_name, test_func):
     test_data = json_object[func_name]
     for test_datum in test_data:
         args, expected = test_datum[0], test_datum[1]
-        desc = "%s(%s) with expected result: %s" % (func_name, str(args), str(expected))
+        desc = "%s(%s) with expected result: %s" % (func_name, str(args),
+                                                    str(expected))
         if len(test_datum) == 3:
             desc = test_datum[2] + " : " + desc
-        func =  partial(test_func, *(args, expected))
+        func = partial(test_func, *(args, expected))
         testcase = unittest.FunctionTestCase(func, description=desc)
         suite.addTest(testcase)
 
+
 def run_tests():
     json_object = json.load(open("testdata.json"))
 
@@ -64,5 +67,6 @@ def run_tests():
     test_runner = unittest.TextTestRunner(verbosity=1)
     test_runner.run(suite)
 
+
 if __name__ == "__main__":
     run_tests()