.travis.yml and python 3.5 fixes

Author: popravich

.travis.yml

@@ -2,15 +2,14 @@ sudo: false
 
 language: python
 python:
-- "2.7"
 - "3.2"
 - "3.3"
 - "3.4"
 - "3.5"
 
 install:
 - pip install -e .
-- pip install coverage pep8 pyflakes
+- pip install coverage pep8 pyflakes mock
 
 script:
 - pyflakes argsrun tests

tests/test_entry.py

@@ -1,10 +1,17 @@
+import sys
 import unittest
 import argparse
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from argsrun import Entry
 
 
+PY_35 = sys.version_info >= (3, 5)
+
+
 class TestEntry(unittest.TestCase):
 
     def dummy_handler(self, opts):
@@ -31,8 +38,11 @@ def test_simple(self):
 
         entry(['script'])
 
-        with self.assertRaisesRegex(ValueError,
-                                    "need more than 0 values to unpack"):
+        if PY_35:
+            msg = "not enough values to unpack"
+        else:
+            msg = "need more than 0 values to unpack"
+        with self.assertRaisesRegex(ValueError, msg):
             entry([])
 
     def test_argparse_setup(self):