1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
|
Author: Varun Hiremath <varun@debian.org>
Date: Wed, 11 Aug 2010 01:32:41 -0400
Description: Fix Python String exceptions. Patch imported from upstream trunk.
diff -urN python-enable-3.3.1.orig/enthought/enable/component.py python-enable-3.3.1/enthought/enable/component.py
--- python-enable-3.3.1.orig/enthought/enable/component.py 2010-08-11 01:17:59.000000000 -0400
+++ python-enable-3.3.1/enthought/enable/component.py 2010-08-11 01:21:37.000000000 -0400
@@ -1153,7 +1153,8 @@
else:
# assume padding is some sort of array type
if len(val) != 4:
- raise RuntimeError, "Padding must be a 4-element sequence type or an int. Instead, got" + str(val)
+ raise RuntimeError("Padding must be a 4-element sequence "
+ "type or an int. Instead, got" + str(val))
self.padding_left = val[0]
self.padding_right = val[1]
self.padding_top = val[2]
diff -urN python-enable-3.3.1.orig/enthought/kiva/pdfmetrics.py python-enable-3.3.1/enthought/kiva/pdfmetrics.py
--- python-enable-3.3.1.orig/enthought/kiva/pdfmetrics.py 2010-08-11 01:17:59.000000000 -0400
+++ python-enable-3.3.1/enthought/kiva/pdfmetrics.py 2010-08-11 01:18:44.000000000 -0400
@@ -290,7 +290,7 @@
def makePDFObject(self):
# XXX Kiva specific change
- raise "Not Implemented"
+ raise NotImplementedError
#for encName in standardEncodings:
# registerEncoding(Encoding(encName))
@@ -354,7 +354,7 @@
def addObjects(self, doc):
# XXX Kiva specific change
- raise "Not Implemented"
+ raise NotImplementedError
PFB_MARKER=chr(0x80)
PFB_ASCII=chr(1)
@@ -446,7 +446,7 @@
def addObjects(self, doc):
# XXX Kiva specific changes
- raise "Not Implemented"
+ raise NotImplementedError
def registerTypeFace(face):
assert isinstance(face, TypeFace), 'Not a TypeFace: %s' % face
|