diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-13 01:09:05 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-13 01:09:05 +0200 |
commit | af0ac85c7a959306f935004bb23d8a650692f6b3 (patch) | |
tree | 6489830751cee8893f67bdf4a61c9e95685bf2a1 /dev-python/lxml/files | |
parent | bb3334a8ba3069a27bab4df33432af20670a2216 (diff) | |
download | overlay-af0ac85c7a959306f935004bb23d8a650692f6b3.tar.gz overlay-af0ac85c7a959306f935004bb23d8a650692f6b3.tar.bz2 overlay-af0ac85c7a959306f935004bb23d8a650692f6b3.zip |
Cleaned
Diffstat (limited to 'dev-python/lxml/files')
-rw-r--r-- | dev-python/lxml/files/gtk-threading-filename-guessing.patch | 35 | ||||
-rw-r--r-- | dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch | 15 | ||||
-rw-r--r-- | dev-python/lxml/files/parse-gtk-problem.patch | 45 |
3 files changed, 0 insertions, 95 deletions
diff --git a/dev-python/lxml/files/gtk-threading-filename-guessing.patch b/dev-python/lxml/files/gtk-threading-filename-guessing.patch deleted file mode 100644 index a48f258..0000000 --- a/dev-python/lxml/files/gtk-threading-filename-guessing.patch +++ /dev/null @@ -1,35 +0,0 @@ -=== src/lxml/apihelpers.pxi -================================================================== ---- src/lxml/apihelpers.pxi (revision 3804) -+++ src/lxml/apihelpers.pxi (revision 3805) -@@ -1107,20 +1107,16 @@ - Returns None if not a file object. - """ - # file instances have a name attribute -- try: -- return source.name -- except AttributeError: -- pass -+ filename = getattr3(source, 'name', None) -+ if filename is not None: -+ return filename - # gzip file instances have a filename attribute -- try: -- return source.filename -- except AttributeError: -- pass -+ filename = getattr3(source, 'filename', None) -+ if filename is not None: -+ return filename - # urllib2 provides a geturl() method -- try: -- geturl = source.geturl -- except AttributeError: -- # can't determine filename -- return None -- else: -+ geturl = getattr3(source, 'geturl', None) -+ if geturl is not None: - return geturl() -+ # can't determine filename -+ return None diff --git a/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch b/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch deleted file mode 100644 index 9042ae6..0000000 --- a/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- setup.py 2008-04-07 15:10:32.989740409 +0300 -+++ setup.py 2008-04-07 15:11:13.897709903 +0300 -@@ -4,10 +4,9 @@ - - try: - import Cython -- # may need to work around setuptools bug by providing a fake Pyrex -- sys.path.insert(0, os.path.join(os.path.dirname(__file__), "fake_pyrex")) - except ImportError: -- pass -+ print >>sys.stderr, "lxml requires cython-0.9.6.10 or later." -+ sys.exit(1) - - try: - import pkg_resources diff --git a/dev-python/lxml/files/parse-gtk-problem.patch b/dev-python/lxml/files/parse-gtk-problem.patch deleted file mode 100644 index e8aafdf..0000000 --- a/dev-python/lxml/files/parse-gtk-problem.patch +++ /dev/null @@ -1,45 +0,0 @@ -=== src/lxml/parser.pxi -================================================================== ---- src/lxml/parser.pxi (revision 3798) -+++ src/lxml/parser.pxi (revision 3799) -@@ -1294,10 +1294,22 @@ - - cdef _Document _parseDocument(source, _BaseParser parser, base_url): - cdef _Document doc -+ if _isString(source): -+ # parse the file directly from the filesystem -+ doc = _parseDocumentFromURL(_encodeFilename(source), parser) -+ # fix base URL if requested -+ if base_url is not None: -+ base_url = _encodeFilenameUTF8(base_url) -+ if doc._c_doc.URL is not NULL: -+ tree.xmlFree(doc._c_doc.URL) -+ doc._c_doc.URL = tree.xmlStrdup(_cstr(base_url)) -+ return doc -+ - if base_url is not None: - url = base_url - else: - url = _getFilenameForFile(source) -+ - if hasattr(source, 'getvalue') and hasattr(source, 'tell'): - # StringIO - reading from start? - if source.tell() == 0: -@@ -1309,16 +1321,7 @@ - return _parseFilelikeDocument( - source, _encodeFilenameUTF8(url), parser) - -- # Otherwise parse the file directly from the filesystem -- filename = _encodeFilename(source) -- doc = _parseDocumentFromURL(filename, parser) -- # fix base URL if requested -- if base_url is not None: -- base_url = _encodeFilenameUTF8(base_url) -- if doc._c_doc.URL is not NULL: -- tree.xmlFree(doc._c_doc.URL) -- doc._c_doc.URL = tree.xmlStrdup(_cstr(base_url)) -- return doc -+ raise TypeError("cannot parse from '%s'" % python._fqtypename(source)) - - cdef _Document _parseDocumentFromURL(url, _BaseParser parser): - cdef xmlDoc* c_doc |