[oe-commits] Michael 'Mickey' Lauer : python-traits: 3.0.2 -> 3.0.3

[GIT User account]

Module: openembedded.git
Branch: mickey/python26
Commit: 87578909929aaecd388edfd3ee1940d623f371c0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=87578909929aaecd388edfd3ee1940d623f371c0

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Jan 14 02:11:13 2009 +0000

python-traits: 3.0.2 -> 3.0.3

---

 .../python/python-traits/fix-import-pyface.diff    |   26 --------------------
 packages/python/python-traits_3.0.2.bb             |   18 -------------
 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 969a18e..0000000
--- 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 901ecc1..0000000
--- 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 0000000..9482a1b
--- /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"