Lots of fixes

tests/test_main.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 import unittest
 
@@ -7,7 +6,7 @@ from aprsd import email
 if sys.version_info >= (3, 2):
     from unittest import mock
 else:
-    import mock
+    from unittest import mock
 
 
 class TestMain(unittest.TestCase):

tests/test_plugin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 from unittest import mock
 
@@ -57,7 +56,10 @@ class TestPlugin(unittest.TestCase):
 
         message = "time"
         expected = "{} ({}:{} PDT) ({})".format(
-            cur_time, str(h), str(m).rjust(2, "0"), message.rstrip()
+            cur_time,
+            str(h),
+            str(m).rjust(2, "0"),
+            message.rstrip(),
         )
         actual = time_plugin.run(fromcall, message, ack)
         self.assertEqual(expected, actual)