tests/test-001-contact_reference.py tests/test-002-attendee.py tests/test-003-event.py

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Jul 13 16:02:33 CEST 2012


 tests/test-001-contact_reference.py |    2 +-
 tests/test-002-attendee.py          |    2 +-
 tests/test-003-event.py             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1b5a666f9a12d55a382fb608ed2cd03dba3dcf99
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jul 13 15:02:15 2012 +0100

    Fix tests for basestrings while actually we want strs

diff --git a/tests/test-001-contact_reference.py b/tests/test-001-contact_reference.py
index c80d139..7c8f128 100644
--- a/tests/test-001-contact_reference.py
+++ b/tests/test-001-contact_reference.py
@@ -16,7 +16,7 @@ class TestEventXML(unittest.TestCase):
                 raise AssertionError, "%s != %s" % (type(_value), _type)
 
     def test_001_minimal(self):
-        self.assertIsInstance(self.contact_reference.__str__(), basestring)
+        self.assertIsInstance(self.contact_reference.__str__(), str)
 
     def test_002_empty_name(self):
         self.assertEqual(self.contact_reference.get_name(), "")
diff --git a/tests/test-002-attendee.py b/tests/test-002-attendee.py
index 465349a..4298761 100644
--- a/tests/test-002-attendee.py
+++ b/tests/test-002-attendee.py
@@ -16,7 +16,7 @@ class TestEventXML(unittest.TestCase):
                 raise AssertionError, "%s != %s" % (type(_value), _type)
 
     def test_001_minimal(self):
-        self.assertIsInstance(self.attendee.__str__(), basestring)
+        self.assertIsInstance(self.attendee.__str__(), str)
 
     def test_002_empty_name(self):
         self.assertEqual(self.attendee.get_name(), "")
diff --git a/tests/test-003-event.py b/tests/test-003-event.py
index 9da4cf6..8f76397 100644
--- a/tests/test-003-event.py
+++ b/tests/test-003-event.py
@@ -27,7 +27,7 @@ class TestEventXML(unittest.TestCase):
     def test_001_minimal(self):
         self.event.set_start(datetime.datetime.now(pytz.timezone("Europe/London")))
         self.assertIsInstance(self.event.get_start(), datetime.datetime)
-        self.assertIsInstance(self.event.__str__(), basestring)
+        self.assertIsInstance(self.event.__str__(), str)
 
     def test_002_attendees_list(self):
         self.assertIsInstance(self.event.get_attendees(), list)





More information about the commits mailing list