[livecoding] r147 committed - Fix the problem case where file level doc strings caused update errors...

[livec...@googlecode.com]

Revision: 147
Author: richard.m.tew
Date: Wed Sep 8 03:12:03 2010
Log: Fix the problem case where file level doc strings caused update errors.
http://code.google.com/p/livecoding/source/detail?r=147

Modified:
/trunk/namespace.py
/trunk/reloader.py

=======================================
--- /trunk/namespace.py Fri Mar 19 00:29:58 2010
+++ /trunk/namespace.py Wed Sep 8 03:12:03 2010
@@ -408,7 +408,7 @@
continue

# By default we never overwrite. This way we can identify
duplicate contributions.
- if hasattr(namespace, k) and k not in overwritableAttributes:
+ if hasattr(namespace, k) and k not in overwritableAttributes
and k != "__doc__":
logger.error("Duplicate namespace contribution for '%s.%s'
from '%s', our class = %s", moduleName, k, scriptFile.filePath, v.__file__
== scriptFile.filePath)
continue

=======================================
--- /trunk/reloader.py Mon Sep 6 05:07:54 2010
+++ /trunk/reloader.py Wed Sep 8 03:12:03 2010
@@ -264,7 +264,7 @@
# Collect entries for the attributes imported or defined by the
new script file.
for k, v, valueType, exportable in
newScriptFile.GetExportableAttributes():
if exportable:
- if hasattr(namespace, k) and k not in
overwritableAttributes:
+ if hasattr(namespace, k) and k not in
overwritableAttributes and k != "__doc__":
logger.error("Duplicate namespace contribution
for '%s.%s' from '%s', our class = %s", moduleName, k, scriptFile.filePath,
v.__file__ == scriptFile.filePath)
continue