blob: 969a18ef303e5912a425c05d9182ef8e9c676161 (
plain)
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
|
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
|
