7 files changed, 21 insertions, 2 deletions
diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py
index 09dba2e..b1d46bd 100644
--- a/src/isodate/tests/__init__.py
+++ b/src/isodate/tests/__init__.py
@@ -46,5 +46,6 @@ def test_suite():
         test_pickle.test_suite(),
         ])
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_date.py b/src/isodate/tests/test_date.py
index 2519e68..6ee89cb 100644
--- a/src/isodate/tests/test_date.py
+++ b/src/isodate/tests/test_date.py
@@ -127,5 +127,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_datetime.py b/src/isodate/tests/test_datetime.py
index ddad5da..3cdfe42 100644
--- a/src/isodate/tests/test_datetime.py
+++ b/src/isodate/tests/test_datetime.py
@@ -142,5 +142,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_duration.py b/src/isodate/tests/test_duration.py
index 0b80a54..b0e0332 100644
--- a/src/isodate/tests/test_duration.py
+++ b/src/isodate/tests/test_duration.py
@@ -313,6 +313,10 @@ class DurationTest(unittest.TestCase):
         self.assertEqual('10 years, 10 months, 10 days, 0:00:10', str(dur))
         self.assertEqual('isodate.duration.Duration(10, 10, 0,'
                          ' years=10, months=10)', repr(dur))
+        dur = Duration(months=0)
+        self.assertEqual('0:00:00', str(dur))
+        dur = Duration(months=1)
+        self.assertEqual('1 month, 0:00:00', str(dur))
 
     def test_hash(self):
         '''
@@ -597,5 +601,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_pickle.py b/src/isodate/tests/test_pickle.py
index b52f8cb..7fc6213 100644
--- a/src/isodate/tests/test_pickle.py
+++ b/src/isodate/tests/test_pickle.py
@@ -1,5 +1,7 @@
 import unittest
-import cPickle as pickle
+
+from six.moves import cPickle as pickle
+
 import isodate
 
 
@@ -31,11 +33,17 @@ class TestPickle(unittest.TestCase):
                 pikl = pickle.dumps(dur, proto)
                 if dur != pickle.loads(pikl):
                     raise Exception("not equal")
-            except Exception, e:
+            except Exception as e:
                 failed.append("pickle proto %d failed (%s)" % (proto, repr(e)))
         self.assertEqual(len(failed), 0, "pickle protos failed: %s" %
                          str(failed))
 
+    def test_pickle_utc(self):
+        '''
+        isodate.UTC objects remain the same after pickling.
+        '''
+        self.assertTrue(isodate.UTC is pickle.loads(pickle.dumps(isodate.UTC)))
+
 
 def test_suite():
     '''
@@ -50,5 +58,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_strf.py b/src/isodate/tests/test_strf.py
index 37a135b..1aa76c7 100644
--- a/src/isodate/tests/test_strf.py
+++ b/src/isodate/tests/test_strf.py
@@ -131,5 +131,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
diff --git a/src/isodate/tests/test_time.py b/src/isodate/tests/test_time.py
index cc5ec08..7dfd0c0 100644
--- a/src/isodate/tests/test_time.py
+++ b/src/isodate/tests/test_time.py
@@ -139,5 +139,6 @@ def test_suite():
 def load_tests(loader, tests, pattern):
     return test_suite()
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')