diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-14 02:11:13 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-14 02:11:13 +0000 |
| commit | 87578909929aaecd388edfd3ee1940d623f371c0 (patch) | |
| tree | 6f81336cd61435b87a9e392f863efc544d65497f /packages/python | |
| parent | 45ac2274ce15517ca8d0091a806951842b2e97af (diff) | |
python-traits: 3.0.2 -> 3.0.3
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-traits/fix-import-pyface.diff | 26 | ||||
| -rw-r--r-- | packages/python/python-traits_3.0.2.bb | 18 | ||||
| -rw-r--r-- | packages/python/python-traits_3.0.3.bb | 18 |
3 files changed, 18 insertions, 44 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 - diff --git a/packages/python/python-traits_3.0.2.bb b/packages/python/python-traits_3.0.2.bb deleted file mode 100644 index 901ecc115a..0000000000 --- a/packages/python/python-traits_3.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Explicitly typed attributes for Python" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "BSD" -PR = "as0" - -SRC_URI = "http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz \ - file://fix-import-pyface.diff;patch=1 \ - " - -S = "${WORKDIR}/Traits-${PV}" - -RDEPENDS = "python-netclient" - -inherit setuptools - -FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/.debug" -FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/protocols/.debug" diff --git a/packages/python/python-traits_3.0.3.bb b/packages/python/python-traits_3.0.3.bb new file mode 100644 index 0000000000..9482a1b242 --- /dev/null +++ b/packages/python/python-traits_3.0.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Explicitly typed attributes for Python" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "ml0" + +inherit setuptools + +SRC_URI = "\ + http://pypi.python.org/packages/source/T/Traits/Traits-${PV}.tar.gz \ +# file://fix-import-pyface.diff;patch=1 \ +" +S = "${WORKDIR}/Traits-${PV}" + +RDEPENDS = "python-netclient" + +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/.debug" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/protocols/.debug" |