diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-16 12:52:11 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-16 12:52:11 +0000 |
| commit | 06a32233c469a3628048d39bc8c79a864b51c1e0 (patch) | |
| tree | 70cda69865cc8b546c4acc1b517efaa57e7b97c6 /packages/python/python-traits | |
| parent | 7b84d457f3f70bb814385e83bd0e001591389104 (diff) | |
| parent | 1fc87ab9a7b9684565785ce5996aba6f5c03fe53 (diff) | |
Merge branch 'mickey/python26' into org.openembedded.dev
Diffstat (limited to 'packages/python/python-traits')
| -rw-r--r-- | packages/python/python-traits/fix-import-pyface.diff | 26 |
1 files changed, 0 insertions, 26 deletions
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 - |