[gnue] r10267 - in trunk/gnue-common: . src/base

[reinhard]

Author: reinhard
Date: 2010-12-03 11:30:08 -0600 (Fri, 03 Dec 2010)
New Revision: 10267

Modified:
   trunk/gnue-common/
   trunk/gnue-common/src/base/tree.py
Log:
Some improvements to documentation and sample code.



Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-03 00:28:11.546999931 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

   + timestamp: 2010-12-03 00:59:15.023999929 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

Name: bzr:file-ids
   - src/apps/GDebug.py 
address@hidden:trunk%2Fgnue-common:src%2Fapps%2FGDebug.py
src/apps/i18n.py        address@hidden:trunk%2Fgnue-common:src%2Fapps%2Fi18n.py
src/datasources/ConnectionTriggerObj.py 
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FConnectionTriggerObj.py
src/datasources/GConnections.py 
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py
src/datasources/GDataSource.py  
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGDataSource.py
src/datasources/GLoginHandler.py        
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGLoginHandler.py
src/logic/NamespaceCore.py      
address@hidden:trunk%2Fgnue-common:src%2Flogic%2FNamespaceCore.py
src/logic/adapters/Base.py      
address@hidden:trunk%2Fgnue-common:src%2Flogic%2Fadapters%2FBase.py
src/logic/adapters/python.py    
address@hidden:trunk%2Fgnue-common:src%2Flogic%2Fadapters%2Fpython.py
src/logic/language.py   
address@hidden:trunk%2Fgnue-common:src%2Flogic%2Flanguage.py

   + src/base/tree.py   address@hidden:trunk%2Fgnue-common:src%2Fbase%2Ftree.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden

Name: bzr:text-parents
   - src/apps/GDebug.py 
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/apps/i18n.py        
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/datasources/ConnectionTriggerObj.py 
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9986
src/datasources/GConnections.py address@hidden
src/datasources/GDataSource.py  address@hidden
src/datasources/GLoginHandler.py        
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/logic/NamespaceCore.py      
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/logic/adapters/Base.py      
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/logic/adapters/python.py    
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
src/logic/language.py   
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954

   + src/base/tree.py   
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10118


Modified: trunk/gnue-common/src/base/tree.py
===================================================================
--- trunk/gnue-common/src/base/tree.py  2010-12-03 17:29:44 UTC (rev 10266)
+++ trunk/gnue-common/src/base/tree.py  2010-12-03 17:30:08 UTC (rev 10267)
@@ -711,20 +711,24 @@
     default value these attributes will have::
 
         class SpecialNode(AttribNode):
-            _node_attribs_ = NamedNode._node_attribs_.copy()
-            _node_attribs_['color'] = {
-                'type': str,
-                'allowed_values': ['white', 'blue', 'red', 'green'],
-                'required': False,
-                'default': 'white',
-                'label': u_("Background Color"),
-                'description': u_("Color on the screen")}
-            _node_attribs_['speed'] = {
-                'type': int,
-                'required': True,
-                'default': 0,
-                'label': u_("Speed"),
-                'description': u_("Speed in km per hour")}
+            _node_attribs_ = AttribNode._node_attribs_.copy()
+            _node_attribs_.update(
+                color = dict(
+                    type = str,
+                    default = 'white',
+                    allowed_values = ['white', 'blue', 'red', 'green'],
+                    required = False,
+                    label = u_("Background Color"),
+                    description = u_("Color on the screen")
+                )
+                speed = dict(
+                    type = int,
+                    default = 0,
+                    required = True,
+                    label = u_("Speed"),
+                    description = u_("Speed in km per hour")
+                )
+            )
 
     The items in the dictionaries are as follows:
 
@@ -784,11 +788,13 @@
     # Class variables
     # -------------------------------------------------------------------------
 
-    _node_attribs_ = {
-            'name': {
-                    'type': str,
-                    'label': u_("Name"),
-                    'description': u_("Name of this element")}}
+    _node_attribs_ = dict(
+        name = dict(
+            type = str,
+            label = u_("Name"),
+            description = u_("Name of this element")
+        )
+    )
 
 
     # -------------------------------------------------------------------------
@@ -1384,9 +1390,15 @@
         def _change_supervisor_(self, value):
             print "Hey, %s's supervisor has changed to %s" % (self, value)
     Member._node_attribs_ = AttribNode._node_attribs_.copy()
-    Member._node_attribs_.update({
-        'rank': {'type': str, 'required': True},
-        'supervisor': {'type': Member}})
+    Member._node_attribs_.update(
+        rank = dict(
+            type = str,
+            required = True
+        ),
+        supervisor = dict(
+            type = Member
+        )
+    )
     class Crew(AttribNode):
         _allowed_children_ = {Member: {}}
         _node_dicts_ = [Member]