Multiple updates trying to resolve coverage issues.

Author: Michael Barr

.travis.yml

@@ -19,6 +19,7 @@ install:
   - travis_retry pip install $DJANGO
   - travis_retry pip install pytz
   - travis_retry pip install coveralls
+  - travis_retry pip install django-discover-runner
 
 script:
   - coverage run --source=timezone_utils run_tests.py

tests/models/timezonefield/__init__.py

@@ -1,2 +1 @@
-from invalid import *
-from valid import *
+__author__ = 'michaelbarr'

tests/test_choices.py

@@ -21,13 +21,13 @@ class TimeZoneChoicesTestCase(TestCase):
     def test_TIMEZONE_OFFSET_REGEX(self):
         now = datetime.now(pytz.timezone('US/Eastern'))
         self.assertRegexpMatches(str(now.strftime('%z')), TIMEZONE_OFFSET_REGEX)
-        self.assertNotRegexpMatches(
-            '-' + str(now.strftime('%z')),
-            TIMEZONE_OFFSET_REGEX
+        self.assertEqual(
+            TIMEZONE_OFFSET_REGEX.match('-' + str(now.strftime('%z'))),
+            None
         )
-        self.assertNotRegexpMatches(
-            str(now.strftime('%z') + '1'),
-            TIMEZONE_OFFSET_REGEX
+        self.assertEqual(
+            TIMEZONE_OFFSET_REGEX.match(str(now.strftime('%z') + '1')),
+            None
         )
 
     def test_ALL_TIMEZONES_CHOICES_length(self):