SF.net SVN: geany:[4597] trunk

[eht16 at users.sourceforge.net]

Revision: 4597
          http://geany.svn.sourceforge.net/geany/?rev=4597&view=rev
Author:   eht16
Date:     2010-01-31 14:23:04 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Make the script a bit more robust with newer Python versions.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scripts/create_py_tags.py

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-31 14:20:47 UTC (rev 4596)
+++ trunk/ChangeLog	2010-01-31 14:23:04 UTC (rev 4597)
@@ -1,3 +1,13 @@
+2010-01-31  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * icons/Makefile.am:
+   Include geany.ico in the distribution tarball.
+ * Makefile.am:
+   Fix 'make distcheck' by removing data/latex.tags from EXTRA_DIST.
+ * scripts/create_py_tags.py:
+   Make the script a bit more robust with newer Python versions.
+
+
 2010-01-31  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * plugins/export.c:

Modified: trunk/scripts/create_py_tags.py
===================================================================
--- trunk/scripts/create_py_tags.py	2010-01-31 14:20:47 UTC (rev 4596)
+++ trunk/scripts/create_py_tags.py	2010-01-31 14:23:04 UTC (rev 4597)
@@ -141,14 +141,17 @@
 					name = obj.__name__
 				except AttributeError:
 					name = obj_name
-				if not name or name.startswith('_'):
+				if not name or not isinstance(name, basestring) or name.startswith('_'):
 					# skip non-public tags
 					continue;
 				if inspect.isfunction(obj):
 					self._add_tag(obj, TYPE_FUNCTION)
 				elif inspect.isclass(obj):
 					self._add_tag(obj, TYPE_CLASS, self._get_superclass(obj))
-					methods = inspect.getmembers(obj, inspect.ismethod)
+					try:
+						methods = inspect.getmembers(obj, inspect.ismethod)
+					except AttributeError:
+						methods = []
 					for m_name, m_obj in methods:
 						# skip non-public tags
 						if m_name.startswith('_') or not inspect.ismethod(m_obj):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.