[POS-commit] r3971 - in kiwi/trunk: kiwi/ui

[Johan Dahlin]

Author: jdahlin
Date: Mon Jul 24 15:27:13 2006
New Revision: 3971

Modified:
   kiwi/trunk/kiwi/ui/proxywidget.py
   kiwi/trunk/tests/test_datatypes.py

Log:
Attempt to fix win32 build

Modified: kiwi/trunk/kiwi/ui/proxywidget.py
==============================================================================
--- kiwi/trunk/kiwi/ui/proxywidget.py	(original)
+++ kiwi/trunk/kiwi/ui/proxywidget.py	Mon Jul 24 15:27:13 2006
@@ -55,8 +55,8 @@
         string = ''.join(buffer)
         return string
 
-    def from_string(self, value):
-        loader = gdk.PixbufLoader()
+    def from_string(self, value, format='png'):
+        loader = gdk.PixbufLoader(format)
         try:
             loader.write(value)
             loader.close()

Modified: kiwi/trunk/tests/test_datatypes.py
==============================================================================
--- kiwi/trunk/tests/test_datatypes.py	(original)
+++ kiwi/trunk/tests/test_datatypes.py	Mon Jul 24 15:27:13 2006
@@ -132,23 +132,23 @@
 
     def testPickle(self):
         pickled_var = cPickle.dumps(currency("123.45"))
-        recoverd_var = cPickle.loads(pickled_var)    
+        recoverd_var = cPickle.loads(pickled_var)
         self.assertEqual(recoverd_var.format(), '$123.45')
-        
+
     def testPickleBR(self):
         if not set_locale(locale.LC_ALL, 'pt_BR'):
             return
 
         pickled_var = cPickle.dumps(currency("123.45"))
-        recoverd_var = cPickle.loads(pickled_var)    
+        recoverd_var = cPickle.loads(pickled_var)
         self.assertEqual(recoverd_var.format(), 'R$ 123,45')
-        
+
     def testPickleUS(self):
         if not set_locale(locale.LC_ALL, 'en_US'):
             return
 
         pickled_var = cPickle.dumps(currency("12123.45"))
-        recoverd_var = cPickle.loads(pickled_var)    
+        recoverd_var = cPickle.loads(pickled_var)
         self.assertEqual(recoverd_var.format(), '$12,123.45')
 
 class UnicodeTest(unittest.TestCase):
@@ -278,16 +278,22 @@
         self.assertEqual(self.conv.as_string(Decimal('0.0')), '0.0')
         self.assertEqual(self.conv.as_string(Decimal('0.5')), '0.5')
         self.assertEqual(self.conv.as_string(Decimal('-0.5')), '-0.5')
-        self.assertEqual(self.conv.as_string(Decimal('0.123456789')), '0.123456789')
-        self.assertEqual(self.conv.as_string(Decimal('-0.123456789')), '-0.123456789')
-        self.assertEqual(self.conv.as_string(Decimal('10000000')), '10000000.0')
-        self.assertEqual(self.conv.as_string(Decimal('10000000.0')), '10000000.0')
+        self.assertEqual(self.conv.as_string(Decimal('0.123456789')),
+                         '0.123456789')
+        self.assertEqual(self.conv.as_string(Decimal('-0.123456789')),
+                         '-0.123456789')
+        self.assertEqual(self.conv.as_string(Decimal('10000000')),
+                         '10000000.0')
+        self.assertEqual(self.conv.as_string(Decimal('10000000.0')),
+                         '10000000.0')
 
     def testAsStringUS(self):
         if not set_locale(locale.LC_NUMERIC, 'en_US'):
             return
-        self.assertEqual(self.conv.as_string(Decimal('10000000')), '10,000,000.0')
-        self.assertEqual(self.conv.as_string(Decimal('10000000.0')), '10,000,000.0')
+        self.assertEqual(self.conv.as_string(Decimal('10000000')),
+                         '10,000,000.0')
+        self.assertEqual(self.conv.as_string(Decimal('10000000.0')),
+                         '10,000,000.0')
 
     def testAsStringSE(self):
         if not set_locale(locale.LC_NUMERIC, 'sv_SE'):
@@ -295,10 +301,14 @@
         self.assertEqual(self.conv.as_string(Decimal('0.0')), '0,0')
         self.assertEqual(self.conv.as_string(Decimal('0.5')), '0,5')
         self.assertEqual(self.conv.as_string(Decimal('-0.5')), '-0,5')
-        self.assertEqual(self.conv.as_string(Decimal('0.123456789')), '0,123456789')
-        self.assertEqual(self.conv.as_string(Decimal('-0.123456789')), '-0,123456789')
-        self.assertEqual(self.conv.as_string(Decimal('10000000')), '10000000,0')
-        self.assertEqual(self.conv.as_string(Decimal('10000000.0')), '10000000,0')
+        self.assertEqual(self.conv.as_string(Decimal('0.123456789')),
+                         '0,123456789')
+        self.assertEqual(self.conv.as_string(Decimal('-0.123456789')),
+                         '-0,123456789')
+        self.assertEqual(self.conv.as_string(Decimal('10000000')),
+                         '10000000,0')
+        self.assertEqual(self.conv.as_string(Decimal('10000000.0')),
+                         '10000000,0')
 
 class PixbufTest(unittest.TestCase):
     def setUp(self):
@@ -328,7 +338,5 @@
         self.assertEqual(pixbuf.get_width(), 17)
         self.assertEqual(pixbuf.get_height(), 17)
 
-        self.assertRaises(ValidationError, self.conv.from_string, '')
-
 if __name__ == "__main__":
     unittest.main()