[Lxml-checkins] r53747 - in lxml/branch/lxml-2.0: . src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Sun Apr 13 20:28:50 2008
New Revision: 53747

Modified:
   lxml/branch/lxml-2.0/CHANGES.txt
   lxml/branch/lxml-2.0/src/lxml/apihelpers.pxi
Log:
missing bug fix for 2.0.4

Modified: lxml/branch/lxml-2.0/CHANGES.txt
==============================================================================
--- lxml/branch/lxml-2.0/CHANGES.txt	(original)
+++ lxml/branch/lxml-2.0/CHANGES.txt	Sun Apr 13 20:28:50 2008
@@ -11,6 +11,8 @@
 Bugs fixed
 ----------
 
+* Hanging thread in conjunction with GTK threading.
+
 * Crash bug in iterparse when moving elements into other documents.
 
 * HTML elements' ``.cssselect()`` method was broken.

Modified: lxml/branch/lxml-2.0/src/lxml/apihelpers.pxi
==============================================================================
--- lxml/branch/lxml-2.0/src/lxml/apihelpers.pxi	(original)
+++ lxml/branch/lxml-2.0/src/lxml/apihelpers.pxi	Sun Apr 13 20:28:50 2008
@@ -1103,20 +1103,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