diff --git a/src/conf.py b/src/conf.py
index 641d7dae5..3b602a7df 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -374,7 +374,7 @@ registerChannelValue(supybot.reply.format, 'time',
 def timestamp(t):
     if t is None:
         t = time.time()
-    elif isinstance(t, float) or isinstance(t, int):
+    if isinstance(t, float) or isinstance(t, int):
         t = time.localtime(t)
     format = get(supybot.reply.format.time, dynamic.channel)
     return time.strftime(format, t)
diff --git a/test/test_utils.py b/test/test_utils.py
index c5b53fe5b..debad420f 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1136,7 +1136,7 @@ class TestCacheDict(SupyTestCase):
 class TestTruncatableSet(SupyTestCase):
     def testBasics(self):
         s = TruncatableSet(['foo', 'bar', 'baz', 'qux'])
-        self.assertEqual(s, {'foo', 'bar', 'baz', 'qux'})
+        self.assertEqual(s, set(['foo', 'bar', 'baz', 'qux']))
         self.failUnless('foo' in s)
         self.failUnless('bar' in s)
         self.failIf('quux' in s)
@@ -1151,13 +1151,13 @@ class TestTruncatableSet(SupyTestCase):
         s.add('baz')
         s.add('qux')
         s.truncate(3)
-        self.assertEqual(s, {'bar', 'baz', 'qux'})
+        self.assertEqual(s, set(['bar', 'baz', 'qux']))
 
     def testTruncateUnion(self):
         s = TruncatableSet(['bar', 'foo'])
-        s |= {'baz', 'qux'}
+        s |= set(['baz', 'qux'])
         s.truncate(3)
-        self.assertEqual(s, {'foo', 'baz', 'qux'})
+        self.assertEqual(s, set(['foo', 'baz', 'qux']))
 
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: