[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7939 - in trunk: gnue-appserver/samples gnue-appserver/src gnue-
|
From: |
johannes |
|
Subject: |
[gnue] r7939 - in trunk: gnue-appserver/samples gnue-appserver/src gnue-appserver/src/language gnue-common/src/apps gnue-common/src/datasources/drivers/Base gnue-common/src/rpc/drivers gnue-common/src/rpc/drivers/xmlrpc gnue-forms/po gnue-forms/src |
|
Date: |
Wed, 28 Sep 2005 12:35:28 -0500 (CDT) |
Author: johannes
Date: 2005-09-21 06:17:08 -0500 (Wed, 21 Sep 2005)
New Revision: 7939
Modified:
trunk/gnue-appserver/samples/auth.gsd
trunk/gnue-appserver/samples/sample-C.gld
trunk/gnue-appserver/samples/sample-de.gld
trunk/gnue-appserver/src/geasSessionManager.py
trunk/gnue-appserver/src/language/Object.py
trunk/gnue-appserver/src/language/Procedure.py
trunk/gnue-appserver/src/language/Session.py
trunk/gnue-common/src/apps/GDebug.py
trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
trunk/gnue-common/src/datasources/drivers/Base/Connection.py
trunk/gnue-common/src/rpc/drivers/Base.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
trunk/gnue-forms/po/de.po
trunk/gnue-forms/src/GFClient.py
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
Log:
Added an assert to gLeave () which will in turn always return True
Modified: trunk/gnue-appserver/samples/auth.gsd
===================================================================
--- trunk/gnue-appserver/samples/auth.gsd 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-appserver/samples/auth.gsd 2005-09-21 11:17:08 UTC (rev
7939)
@@ -5,7 +5,7 @@
<tabledata name="sample_accounts" tablename="gnue_useraccess">
<rows>
<row>
- <value field="gnue_id"
key="Y">00000000000000000000001000000001</value>
+ <value field="gnue_id">00000000000000000000001000000001</value>
<value field="gnue_username">test</value>
<value field="gnue_password">test</value>
<value field="gnue_accesslist">address_person,address_country</value>
Modified: trunk/gnue-appserver/samples/sample-C.gld
===================================================================
--- trunk/gnue-appserver/samples/sample-C.gld 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-appserver/samples/sample-C.gld 2005-09-21 11:17:08 UTC (rev
7939)
@@ -7,7 +7,7 @@
<property name="name" pos="200" search="200" label="Name"/>
</class>
- <class name="person">
+ <class name="person" label="Person">
<property name="name" pos="100" label="Name" search="100"/>
<property name="street" pos="200" label="Street"/>
<property name="zip" pos="300" label="Zip"/>
Modified: trunk/gnue-appserver/samples/sample-de.gld
===================================================================
--- trunk/gnue-appserver/samples/sample-de.gld 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-appserver/samples/sample-de.gld 2005-09-21 11:17:08 UTC (rev
7939)
@@ -2,7 +2,7 @@
<module name="address" language="de">
- <class name="country">
+ <class name="country" label="Länder">
<property name="code" pos="100" search="100" label="ISO-Code"/>
<property name="name" pos="200" search="200" label="Ländername"/>
</class>
Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py 2005-09-21 11:01:46 UTC
(rev 7938)
+++ trunk/gnue-appserver/src/geasSessionManager.py 2005-09-21 11:17:08 UTC
(rev 7939)
@@ -233,8 +233,11 @@
session_id = id (sess)
self._sessions [session_id] = sess
- return gLeave (4, session_id)
+ result = session_id
+ assert gLeave (4, result)
+ return result
+
# ---------------------------------------------------------------------------
# Close the connection
# ---------------------------------------------------------------------------
@@ -249,7 +252,7 @@
s.logout ()
del self._sessions [session_id]
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
# Commit current transaction
@@ -262,7 +265,7 @@
s = self._getSession (session_id)
s.commit ()
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
# Rollback current transaction
@@ -275,7 +278,7 @@
s = self._getSession (session_id)
s.rollback ()
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
@@ -290,7 +293,8 @@
s = self._getSession (session_id)
result = s.request (classname, conditions, sortorder, propertylist)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
@@ -304,7 +308,8 @@
s = self._getSession (session_id)
result = s.count (list_id)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
# Fetch objects from list
@@ -316,7 +321,8 @@
s = self._getSession (session_id)
result = s.fetch (list_id, start, count)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
@@ -330,7 +336,8 @@
s = self._getSession (session_id)
result = s.load (classname, obj_id_list, propertylist)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
# Store objects
@@ -343,7 +350,8 @@
s = self._getSession (session_id)
result = s.store (classname, obj_id_list, propertylist, data)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
# Delete objects
@@ -356,7 +364,7 @@
s = self._getSession (session_id)
s.delete (classname, obj_id_list)
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
@@ -371,7 +379,8 @@
s = self._getSession (session_id)
result = s.call (classname, obj_id_list, procedurename, parameters)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
# ---------------------------------------------------------------------------
@@ -384,4 +393,5 @@
return self.repository.getFilterDefinition (language)
- return gLeave (4, result)
+ assert gLeave (4, result)
+ return result
Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-appserver/src/language/Object.py 2005-09-21 11:17:08 UTC (rev
7939)
@@ -77,7 +77,8 @@
if key == "gnue_id":
result = self.objectId
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
sm = self.__session.getSessionManager ()
@@ -112,7 +113,8 @@
else:
result = value
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# -------------------------------------------------------------------------
@@ -156,7 +158,7 @@
sm.store (self.__sid, self.__class, [self.objectId], [name], [[__value]])
- gLeave (6)
+ assert gLeave (6)
# -------------------------------------------------------------------------
@@ -217,7 +219,7 @@
sm.delete (self.__sid, self.__class, [self.objectId])
self.objectId = None
- gLeave (6)
+ assert gLeave (6)
@@ -269,7 +271,8 @@
else:
result = None
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/language/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/language/Procedure.py 2005-09-21 11:01:46 UTC
(rev 7938)
+++ trunk/gnue-appserver/src/language/Procedure.py 2005-09-21 11:17:08 UTC
(rev 7939)
@@ -47,4 +47,5 @@
result = sm.call (sid, self.__class, [self.__objectId], self.method,
params) [0]
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py 2005-09-21 11:01:46 UTC
(rev 7938)
+++ trunk/gnue-appserver/src/language/Session.py 2005-09-21 11:17:08 UTC
(rev 7939)
@@ -193,7 +193,7 @@
self.__sm.close (self.__session_id, None)
self.__sm = self.__session_id = None
- gLeave (6)
+ assert gLeave (6)
# -------------------------------------------------------------------------
@@ -210,7 +210,7 @@
if self.__session_id is not None:
self.__sm.commit (self.__session_id)
- gLeave (6)
+ assert gLeave (6)
# -------------------------------------------------------------------------
@@ -227,7 +227,7 @@
if self.__session_id is not None:
self.__sm.rollback (self.__session_id)
- gLeave (6)
+ assert gLeave (6)
# -------------------------------------------------------------------------
@@ -260,7 +260,8 @@
result = ObjectList (self, name, conditions, sortorder, properties, cdef)
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# -------------------------------------------------------------------------
@@ -279,7 +280,8 @@
result = self._get (classname)
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# ---------------------------------------------------------------------------
@@ -304,7 +306,8 @@
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# -------------------------------------------------------------------------
@@ -332,7 +335,8 @@
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- return gLeave (6, result)
+ assert gLeave (6, result)
+ return result
# -------------------------------------------------------------------------
@@ -383,7 +387,8 @@
else:
text = text % args
- return gLeave (6, text)
+ assert gLeave (6, text)
+ return text
raise MessageNotFoundError, self.qualify (messageName)
Modified: trunk/gnue-common/src/apps/GDebug.py
===================================================================
--- trunk/gnue-common/src/apps/GDebug.py 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-common/src/apps/GDebug.py 2005-09-21 11:17:08 UTC (rev
7939)
@@ -282,17 +282,11 @@
@param level: debug-level to send the message to
@param result: the function's result (if any)
- @return: the result parameter
+ @return: True
"""
- # We cannot use something like 'retVal = len (result) and result [0] or None'
- # here, cause this won't work for 'empty' results like [] or {}.
- retVal = None
- if len (result):
- retVal = result [0]
-
if not level in _DEBUG_LEVELS:
- return retVal
+ return True
# Get the caller's frame
frame = sys._getframe (1)
@@ -308,7 +302,7 @@
fName = "%s.%s" % (flocals ['self'].__class__, fName)
hId = repr (hex (id (flocals ['self'])))
- resStr = len (result) and ' == %s' % repr (retVal) or ''
+ resStr = len (result) and ' == %s' % repr (result [0]) or ''
message = "Leaving function %s (%s)%s" % (fName, hId, resStr)
path = frame.f_code.co_filename
@@ -325,7 +319,7 @@
# Make sure to release the reference to the frame object. This keeps
# garbage collection doing a fine job :)
del frame
- return retVal
+ return True
# -----------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2005-09-21
11:01:46 UTC (rev 7938)
+++ trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2005-09-21
11:17:08 UTC (rev 7939)
@@ -130,7 +130,7 @@
assert gEnter (8)
self._createDatabase_ ()
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -167,7 +167,8 @@
result = self._writeSchema_ (self._current, self._new, self._diff,
simulation)
- gLeave (8, result)
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -191,7 +192,8 @@
self._readSchema_ (result)
- return gLeave (8, result)
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Connection.py
2005-09-21 11:01:46 UTC (rev 7938)
+++ trunk/gnue-common/src/datasources/drivers/Base/Connection.py
2005-09-21 11:17:08 UTC (rev 7939)
@@ -169,7 +169,9 @@
"""
assert gEnter (8)
- return gLeave (8, self._getLoginFields_ ())
+ result = self._getLoginFields_ ()
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -193,7 +195,7 @@
assert gEnter (8)
self._connect_ (connectData)
self._beginTransaction_ ()
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -215,7 +217,9 @@
checktype (fields, list)
assert gEnter (8)
- return gLeave (8, self._initialize_ (table, fields))
+ result = self._initialize_ (table, fields)
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -240,7 +244,8 @@
assert gEnter (8)
rowid = self._insert_ (table, newfields)
self.__pending = True
- return gLeave (8, rowid)
+ assert gLeave (8, rowid)
+ return rowid
# ---------------------------------------------------------------------------
@@ -266,7 +271,7 @@
assert gEnter (8)
self._update_ (table, oldfields, newfields)
self.__pending = True
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -290,7 +295,7 @@
assert gEnter (8)
self._delete_ (table, oldfields)
self.__pending = True
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -315,9 +320,12 @@
checktype (fields, list)
assert gEnter (8)
- return gLeave (8, self._requery_ (table, oldfields, fields))
+ result = self._requery_ (table, oldfields, fields)
+ assert gLeave (8, result)
+ return result
+
# ---------------------------------------------------------------------------
# Call a backend function
# ---------------------------------------------------------------------------
@@ -346,7 +354,8 @@
# FIXME: Some calls should not make the connection pending, like requesting
# the generated form. Most others should.
# self.__pending = True
- return gLeave (8, result)
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -380,7 +389,7 @@
self._commit_ ()
self.__pending = False
self._beginTransaction_ ()
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -399,7 +408,7 @@
self._rollback_ ()
self.__pending = False
self._beginTransaction_ ()
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -417,7 +426,7 @@
assert gEnter (8)
self._close_ ()
self.manager._connectionClosed (self)
- gLeave (8)
+ assert gLeave (8)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/Base.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/Base.py 2005-09-21 11:01:46 UTC (rev
7938)
+++ trunk/gnue-common/src/rpc/drivers/Base.py 2005-09-21 11:17:08 UTC (rev
7939)
@@ -190,7 +190,9 @@
"""
assert gEnter (8)
- return gLeave (8, self._getServerProxy_ ())
+ result = self._getServerProxy_ ()
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -276,8 +278,9 @@
"""
assert gEnter (8)
- return gLeave (8, self._adapter._callMethod_ (self._methodname, *args,
- **params))
+ result = self._adapter._callMethod_ (self._methodname, *args, **params)
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
@@ -377,7 +380,9 @@
"""
assert gEnter (8)
- return gLeave (8, self._serve_ ())
+ result = self._serve_ ()
+ assert gLeave (8, result)
+ return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2005-09-21
11:01:46 UTC (rev 7938)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2005-09-21
11:17:08 UTC (rev 7939)
@@ -197,8 +197,10 @@
except socket.error:
raise errors.AdminError, errors.getException () [2]
- return gLeave (9, typeconv.rpc_to_python (result, self.__wrapProxy,
- client.InvalidParameter))
+ result = typeconv.rpc_to_python (result, self.__wrapProxy,
+ client.InvalidParameter)
+ assert gLeave (9, result)
+ return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2005-09-21
11:01:46 UTC (rev 7938)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2005-09-21
11:17:08 UTC (rev 7939)
@@ -122,7 +122,9 @@
server.InvalidParameter)
result = self._tcpServer._dispatch (method, params)
- return gLeave (9, typeconv.python_to_rpc (result, self._updateStore))
+ result = typeconv.python_to_rpc (result, self._updateStore)
+ assert gLeave (9, result)
+ return result
# ---------------------------------------------------------------------------
@@ -132,7 +134,9 @@
def _call (self, storedObject, method, *parameters):
assert gEnter (9)
- return gLeave (9, getattr (storedObject, method) (*parameters))
+ result = getattr (storedObject, method) (*parameters)
+ assert gLeave (9, result)
+ return result
# ---------------------------------------------------------------------------
@@ -146,7 +150,7 @@
if id (item) in self._objectStore:
del self._objectStore [id (item)]
- gLeave (9)
+ assert gLeave (9)
# ---------------------------------------------------------------------------
@@ -160,7 +164,8 @@
result = {'__id__': id (item), '__rpc_datatype__': 'object'}
self._objectStore [id (item)] = item
- return gLeave (9, result)
+ assert gLeave (9, result)
+ return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/po/de.po
===================================================================
--- trunk/gnue-forms/po/de.po 2005-09-21 11:01:46 UTC (rev 7938)
+++ trunk/gnue-forms/po/de.po 2005-09-21 11:17:08 UTC (rev 7939)
@@ -179,7 +179,7 @@
#: GFInstance.py:993
msgid "Jump to record"
-msgstr "&Springe zu Datensatz..."
+msgstr "Springe zu Datensatz"
#: GFKeyMapper.py:118
msgid "Invalid keystroke id '%(key)s' in keymap for '%(event)s'"
Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py 2005-09-21 11:01:46 UTC (rev 7938)
+++ trunk/gnue-forms/src/GFClient.py 2005-09-21 11:17:08 UTC (rev 7939)
@@ -199,7 +199,7 @@
assert gDebug (4, "Closing all connections")
self.getConnectionManager ().closeAll ()
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-09-21 11:01:46 UTC (rev 7938)
+++ trunk/gnue-forms/src/GFForm.py 2005-09-21 11:17:08 UTC (rev 7939)
@@ -735,7 +735,7 @@
self.findAndChangeFocus (newBlock)
self.dispatchEvent ('endWAIT', _form = self)
- gLeave (4)
+ assert gLeave (4)
return message
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-09-21 11:01:46 UTC (rev 7938)
+++ trunk/gnue-forms/src/GFInstance.py 2005-09-21 11:17:08 UTC (rev 7939)
@@ -161,7 +161,7 @@
parentContainer = self._parentContainer,
moduleName = moduleName)
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
@@ -330,7 +330,7 @@
self._uiinstance.mainLoop ()
assert gDebug (4, "Returning from main loop")
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
@@ -364,7 +364,7 @@
assert gDebug (4, "Activating form")
self._uiinstance.activateForm (formName, modal)
- gLeave (4)
+ assert gLeave (4)
# ---------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7939 - in trunk: gnue-appserver/samples gnue-appserver/src gnue-appserver/src/language gnue-common/src/apps gnue-common/src/datasources/drivers/Base gnue-common/src/rpc/drivers gnue-common/src/rpc/drivers/xmlrpc gnue-forms/po gnue-forms/src,
johannes <=