[Checkins] SVN: Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/ Provide only one description attribute.
Uli Fouquet
uli at gnufix.de
Wed Mar 10 08:36:02 EST 2010
Log message for revision 109894:
Provide only one description attribute.
Changed:
U Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/objectinfo.py
U Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/memberinfo.pt
U Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/zodbbrowser.pt
-=-
Modified: Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/objectinfo.py
===================================================================
--- Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/objectinfo.py 2010-03-10 13:22:30 UTC (rev 109893)
+++ Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/objectinfo.py 2010-03-10 13:36:01 UTC (rev 109894)
@@ -21,7 +21,6 @@
self._name = None
self._parent_oid = None
-
@property
def name(self):
"""Get name of wrapped obj.
@@ -34,13 +33,17 @@
def parent(self):
return getattr(self.obj, '__parent__', None)
- def getDescription(self):
- descr = getattr(self.obj, '__doc__', u'')
+ @property
+ def description(self):
+ """Get a description of the associated object.
+
+ This is currently the docstring if it exists or empty string.
+ """
descr = inspect.getdoc(self.obj)
if descr is None:
return u''
return descr
-
+
def getMembers(self):
result = []
for name, obj in inspect.getmembers(self.obj):
@@ -86,11 +89,6 @@
return self.name
@property
- def doc(self):
- descr = inspect.getdoc(self.obj)
- return descr
-
- @property
def type_string(self):
try:
return str(type(self.obj))
Modified: Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/memberinfo.pt
===================================================================
--- Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/memberinfo.pt 2010-03-10 13:22:30 UTC (rev 109893)
+++ Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/memberinfo.pt 2010-03-10 13:36:01 UTC (rev 109894)
@@ -12,7 +12,7 @@
</b>
<span tal:content="context/getValue">member-value</span>
<p>
- <pre tal:condition="python: context.doc and view.show_docs"
- tal:content="context/doc">member.docs</pre>
+ <pre tal:condition="python: context.description and view.show_docs"
+ tal:content="context/description">member.docs</pre>
</p>
</div>
Modified: Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/zodbbrowser.pt
===================================================================
--- Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/zodbbrowser.pt 2010-03-10 13:22:30 UTC (rev 109893)
+++ Sandbox/ulif/grokui.zodbbrowser/src/grokui/zodbbrowser/templates/zodbbrowser.pt 2010-03-10 13:36:01 UTC (rev 109894)
@@ -17,7 +17,7 @@
</p>
<h3 tal:content="view/info/name">the_object_name</h3>
<h3 tal:content="view/info/type_string">The_Object</h3>
-<div tal:content="view/info/getDescription">
+<div tal:content="view/info/description">
The object description
</div>
More information about the checkins
mailing list