[Checkins] SVN: zope.size/trunk/src/zope/size/tests.py Python 3 compatibility.
Albertas Agejevas
cvs-admin at zope.org
Wed Feb 13 16:55:47 UTC 2013
Log message for revision 129343:
Python 3 compatibility.
Changed:
U zope.size/trunk/src/zope/size/tests.py
-=-
Modified: zope.size/trunk/src/zope/size/tests.py
===================================================================
--- zope.size/trunk/src/zope/size/tests.py 2013-02-13 16:55:35 UTC (rev 129342)
+++ zope.size/trunk/src/zope/size/tests.py 2013-02-13 16:55:46 UTC (rev 129343)
@@ -13,6 +13,7 @@
##############################################################################
"""Test ISized Adapter
"""
+from __future__ import unicode_literals
import unittest
from zope.size.interfaces import ISized
import zope.size
@@ -30,7 +31,7 @@
try:
zope.configuration.xmlconfig.XMLConfig(
'configure.zcml', zope.size)()
- except Exception, e:
+ except Exception as e:
self.fail(e)
def test_configure_should_register_n_components(self):
@@ -62,56 +63,56 @@
def testImplementsISized(self):
from zope.size import DefaultSized
sized = DefaultSized(object())
- self.assert_(ISized.providedBy(sized))
+ self.assertTrue(ISized.providedBy(sized))
def testSizeWithBytes(self):
from zope.size import DefaultSized
obj = DummyObject(1023)
sized = DefaultSized(obj)
self.assertEqual(sized.sizeForSorting(), ('byte', 1023))
- self.assertEqual(sized.sizeForDisplay(), u'1 KB')
+ self.assertEqual(sized.sizeForDisplay(), '1 KB')
def testSizeWithNone(self):
from zope.size import DefaultSized
obj = DummyObject(None)
sized = DefaultSized(obj)
self.assertEqual(sized.sizeForSorting(), (None, None))
- self.assertEqual(sized.sizeForDisplay(), u'not-available')
+ self.assertEqual(sized.sizeForDisplay(), 'not-available')
def testSizeNotAvailable(self):
from zope.size import DefaultSized
sized = DefaultSized(object())
self.assertEqual(sized.sizeForSorting(), (None, None))
- self.assertEqual(sized.sizeForDisplay(), u'not-available')
+ self.assertEqual(sized.sizeForDisplay(), 'not-available')
def testVariousSizes(self):
from zope.size import DefaultSized
sized = DefaultSized(DummyObject(0))
self.assertEqual(sized.sizeForSorting(), ('byte', 0))
- self.assertEqual(sized.sizeForDisplay(), u'0 KB')
+ self.assertEqual(sized.sizeForDisplay(), '0 KB')
sized = DefaultSized(DummyObject(1))
self.assertEqual(sized.sizeForSorting(), ('byte', 1))
- self.assertEqual(sized.sizeForDisplay(), u'1 KB')
+ self.assertEqual(sized.sizeForDisplay(), '1 KB')
sized = DefaultSized(DummyObject(2048))
self.assertEqual(sized.sizeForSorting(), ('byte', 2048))
- self.assertEqual(sized.sizeForDisplay(), u'${size} KB')
+ self.assertEqual(sized.sizeForDisplay(), '${size} KB')
self.assertEqual(sized.sizeForDisplay().mapping, {'size': '2'})
sized = DefaultSized(DummyObject(2000000))
self.assertEqual(sized.sizeForSorting(), ('byte', 2000000))
- self.assertEqual(sized.sizeForDisplay(), u'${size} MB')
+ self.assertEqual(sized.sizeForDisplay(), '${size} MB')
self.assertEqual(sized.sizeForDisplay().mapping, {'size': '1.91'})
def test_byteDisplay(self):
from zope.size import byteDisplay
- self.assertEqual(byteDisplay(0), u'0 KB')
- self.assertEqual(byteDisplay(1), u'1 KB')
- self.assertEqual(byteDisplay(2048), u'${size} KB')
+ self.assertEqual(byteDisplay(0), '0 KB')
+ self.assertEqual(byteDisplay(1), '1 KB')
+ self.assertEqual(byteDisplay(2048), '${size} KB')
self.assertEqual(byteDisplay(2048).mapping, {'size': '2'})
- self.assertEqual(byteDisplay(2000000), u'${size} MB')
+ self.assertEqual(byteDisplay(2000000), '${size} MB')
self.assertEqual(byteDisplay(2000000).mapping, {'size': '1.91'})
More information about the checkins
mailing list