From 87578909929aaecd388edfd3ee1940d623f371c0 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 14 Jan 2009 02:11:13 +0000 Subject: python-traits: 3.0.2 -> 3.0.3 --- .../python/python-traits/fix-import-pyface.diff | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 packages/python/python-traits/fix-import-pyface.diff (limited to 'packages/python/python-traits') diff --git a/packages/python/python-traits/fix-import-pyface.diff b/packages/python/python-traits/fix-import-pyface.diff deleted file mode 100644 index 969a18ef30..0000000000 --- a/packages/python/python-traits/fix-import-pyface.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -r -u Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py Traits-3.0.2/enthought/traits/ui/ui_traits.py ---- Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py 2008-09-15 13:15:58.000000000 -0700 -+++ Traits-3.0.2/enthought/traits/ui/ui_traits.py 2008-11-27 14:55:05.000000000 -0800 -@@ -147,8 +147,6 @@ - """ - global image_resource_cache - -- from enthought.pyface.image_resource import ImageResource -- - if not isinstance( value, basestring ): - return value - -@@ -168,7 +166,12 @@ - except: - result = None - else: -- result = ImageResource( value, search_path = [ search_path ] ) -+ try: -+ from enthought.pyface.image_resource import ImageResource -+ except ImportError: -+ result = None -+ else: -+ result = ImageResource( value, search_path = [ search_path ] ) - - image_resource_cache[ key ] = result - -- cgit v1.2.3