Merge branch 'master' into add-ribbon-lib

This commit is contained in:
Robin Dunn
2016-07-01 20:24:07 -07:00
364 changed files with 467 additions and 1261 deletions

View File

@@ -346,7 +346,7 @@ def describe_class(obj, module_class, module_name, constants):
# Thanks to ReportLab for this funny exception...
continue
except ImportError:
# This can come from the pseudo module in wx.lib.six
# This can come from the pseudo module in six
message = "ImportError from '%s.%s'.\n Exception was: %s"%(obj, name, format_traceback())
print(('\nWARNING: %s\n' % message))
continue