[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7898 - in trunk: gnue-appserver/src gnue-appserver/src/gld gnue-
|
From: |
jamest |
|
Subject: |
[gnue] r7898 - in trunk: gnue-appserver/src gnue-appserver/src/gld gnue-appserver/src/language gnue-common/src/apps gnue-common/src/cursing gnue-common/src/datasources gnue-common/src/datasources/drivers/Base gnue-common/src/datasources/drivers/DBSIG2 gnue-common/src/datasources/drivers/sql gnue-common/src/datasources/drivers/sql/interbase gnue-common/src/datasources/drivers/sql/msado gnue-common/src/datasources/drivers/sql/postgresql gnue-common/src/definitions gnue-common/src/formatting/masks gnue-common/src/logic gnue-common/src/rpc/drivers gnue-common/src/rpc/drivers/_helpers gnue-common/src/rpc/drivers/pyro gnue-common/src/rpc/drivers/xmlrpc gnue-common/src/utils gnue-forms/src gnue-forms/src/GFObjects gnue-forms/src/input/displayHandlers gnue-forms/src/uidrivers/_base gnue-forms/src/uidrivers/curses gnue-forms/src/uidrivers/curses/widgets gnue-forms/src/uidrivers/gtk2 gnue-forms/src/uidrivers/gtk2/widgets gnue-forms/src/uidrivers/gtk2/widgets/form gnue-forms/src/uidrivers/wx gnue-navigator/src |
|
Date: |
Mon, 12 Sep 2005 09:31:44 -0500 (CDT) |
Author: jamest
Date: 2005-09-12 09:31:40 -0500 (Mon, 12 Sep 2005)
New Revision: 7898
Modified:
trunk/gnue-appserver/src/data.py
trunk/gnue-appserver/src/geasAuthentication.py
trunk/gnue-appserver/src/geasGsdGen.py
trunk/gnue-appserver/src/geasRpcServer.py
trunk/gnue-appserver/src/geasSessionManager.py
trunk/gnue-appserver/src/gld/readgld.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/GBaseApp.py
trunk/gnue-common/src/apps/GConfig.py
trunk/gnue-common/src/apps/GDebug.py
trunk/gnue-common/src/apps/GLogger.py
trunk/gnue-common/src/cursing/ColorScheme.py
trunk/gnue-common/src/cursing/FocusedLabel.py
trunk/gnue-common/src/cursing/Frame.py
trunk/gnue-common/src/cursing/Menu.py
trunk/gnue-common/src/cursing/MenuBar.py
trunk/gnue-common/src/cursing/StatusBar.py
trunk/gnue-common/src/cursing/sio.py
trunk/gnue-common/src/datasources/ConnectionTriggerObj.py
trunk/gnue-common/src/datasources/GConnections.py
trunk/gnue-common/src/datasources/GDataSource.py
trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
trunk/gnue-common/src/datasources/drivers/Base/Connection.py
trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
trunk/gnue-common/src/datasources/drivers/sql/__init__.py
trunk/gnue-common/src/datasources/drivers/sql/interbase/__init__.py
trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
trunk/gnue-common/src/datasources/drivers/sql/msado/__init__.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
trunk/gnue-common/src/definitions/GParser.py
trunk/gnue-common/src/definitions/GParserHelpers.py
trunk/gnue-common/src/formatting/masks/Masks.py
trunk/gnue-common/src/logic/GTrigger.py
trunk/gnue-common/src/rpc/drivers/Base.py
trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
trunk/gnue-common/src/utils/http.py
trunk/gnue-forms/src/GFClient.py
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/GFObjects/GFBlock.py
trunk/gnue-forms/src/GFObjects/GFField.py
trunk/gnue-forms/src/input/displayHandlers/Base.py
trunk/gnue-forms/src/input/displayHandlers/Cursor.py
trunk/gnue-forms/src/input/displayHandlers/DateTime.py
trunk/gnue-forms/src/input/displayHandlers/Password.py
trunk/gnue-forms/src/input/displayHandlers/__init__.py
trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
trunk/gnue-forms/src/uidrivers/gtk2/common.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
trunk/gnue-forms/src/uidrivers/wx/common.py
trunk/gnue-navigator/src/GNClient.py
trunk/gnue-navigator/src/GNObjects.py
Log:
prefix all gDebug and gEnter calls with assert
Modified: trunk/gnue-appserver/src/data.py
===================================================================
--- trunk/gnue-appserver/src/data.py 2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-appserver/src/data.py 2005-09-12 14:31:40 UTC (rev 7898)
@@ -983,7 +983,7 @@
records = [(table, row) for (table, row) in self.__cache.inserted.values
()\
if self.__cache.state (table, row) == 'inserted']
result = self.__orderByDependency (records)
- gDebug (1, "Ordered inserts: %s" % result)
+ assert gDebug (1, "Ordered inserts: %s" % result)
return result
@@ -1025,8 +1025,8 @@
data = {}
fishes = {}
- gDebug (1, "Constraints: %s" % self.__constraints)
- gDebug (1, "Unordered : %s" % records)
+ assert gDebug (1, "Constraints: %s" % self.__constraints)
+ assert gDebug (1, "Unordered : %s" % records)
# First create a dictionary with all tables scheduled for processing, and
# another dictionary of all records grouped by their tablename
Modified: trunk/gnue-appserver/src/geasAuthentication.py
===================================================================
--- trunk/gnue-appserver/src/geasAuthentication.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-appserver/src/geasAuthentication.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -105,7 +105,7 @@
if authData [0] [2] != auth ['password']:
raise AuthError, u_("Invalid password for user '%s'") % user
- gDebug (1, "User '%s' logged in." % user)
+ assert gDebug (1, "User '%s' logged in." % user)
# possibly not the best solution
session.tablelist = authData[0][3].split (',')
@@ -123,7 +123,7 @@
if 'all' in tables or classname in tables:
return True
else:
- gDebug (1, "User '%(username)s' has no access to class %(classname)s." \
+ assert gDebug (1, "User '%(username)s' has no access to class
%(classname)s." \
% {"username" : user, "classname": classname})
return False
Modified: trunk/gnue-appserver/src/geasGsdGen.py
===================================================================
--- trunk/gnue-appserver/src/geasGsdGen.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-appserver/src/geasGsdGen.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -102,7 +102,7 @@
cparser = self.configurationManager._loadedConfigs ['gnue.conf']
if self.OPTIONS ["database"] is not None:
- gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
+ assert gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
"depreciated. Use '--connection' instead.")
cparser.set ('appserver', 'connection', self.OPTIONS ["database"])
@@ -437,7 +437,7 @@
result [parts [0]][field] = value
- gDebug (1, "Filter-Params: %s" % result)
+ assert gDebug (1, "Filter-Params: %s" % result)
return result
@@ -509,7 +509,7 @@
result [filterId] = match
- gDebug (1, "Filters: %s" % result)
+ assert gDebug (1, "Filters: %s" % result)
return result
@@ -717,7 +717,7 @@
if len (cond):
result [className] = cond
- gDebug (1, "Condition-Dict: %s" % result)
+ assert gDebug (1, "Condition-Dict: %s" % result)
return result
Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-appserver/src/geasRpcServer.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -122,7 +122,7 @@
cparser.set ('appserver', 'rpcport', self.OPTIONS ["rpcport"])
if self.OPTIONS ["database"] is not None:
- gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
+ assert gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
"depreciated. Please use 'connection' instead.")
cparser.set ('appserver', 'connection', self.OPTIONS ["database"])
else:
Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-appserver/src/geasSessionManager.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -67,11 +67,11 @@
cfg = gConfigDict (section = 'appserver')
dbauth = cfg.get ('authentication', 'False')
if dbauth.lower () in ['true', 'yes', 'y']:
- gDebug (1, "Using DB Auth Agent")
+ assert gDebug (1, "Using DB Auth Agent")
self._authAdapter = geasAuthentication.geasDBAuthAgent ( \
self._internalSession)
else:
- gDebug (1, "Using dummy Auth Agent")
+ assert gDebug (1, "Using dummy Auth Agent")
self._authAdapter = geasAuthentication.geasAuthAgent ()
self._langRuntimes = {}
@@ -147,7 +147,7 @@
raise
msg = u_("Failed reloading repository: %s") % errors.getException () [3]
- gDebug (1, msg)
+ assert gDebug (1, msg)
print o(msg)
else:
@@ -190,7 +190,7 @@
gcds, glds = [], []
for root in parts:
- gDebug (1, "Scanning path '%s'" % root)
+ assert gDebug (1, "Scanning path '%s'" % root)
arg = {'gcd': [], 'gld': []}
os.path.walk (root, self.__visitPath, arg)
@@ -234,7 +234,7 @@
def open (self, authentication):
- gEnter (4)
+ assert gEnter (4)
loginHandler = self._connections._loginHandler
loginOptions = self._connections._loginOptions
@@ -261,7 +261,7 @@
def close (self, session_id, commit):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
if commit:
@@ -277,7 +277,7 @@
def commit (self, session_id):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
s.commit ()
@@ -290,7 +290,7 @@
def rollback (self, session_id):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
s.rollback ()
@@ -305,7 +305,7 @@
def request (self, session_id, classname, conditions, sortorder,
propertylist):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.request (classname, conditions, sortorder, propertylist)
@@ -319,7 +319,7 @@
def count (self, session_id, list_id):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.count (list_id)
@@ -332,7 +332,7 @@
def fetch (self, session_id, list_id, start, count, close = False):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.fetch (list_id, start, count)
@@ -345,7 +345,7 @@
def load (self, session_id, classname, obj_id_list, propertylist):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.load (classname, obj_id_list, propertylist)
@@ -358,7 +358,7 @@
def store (self, session_id, classname, obj_id_list, propertylist, data):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.store (classname, obj_id_list, propertylist, data)
@@ -371,7 +371,7 @@
def delete (self, session_id, classname, obj_id_list):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
s.delete (classname, obj_id_list)
@@ -386,7 +386,7 @@
def call (self, session_id, classname, obj_id_list, procedurename,
parameters):
- gEnter (4)
+ assert gEnter (4)
s = self._getSession (session_id)
result = s.call (classname, obj_id_list, procedurename, parameters)
@@ -400,7 +400,7 @@
def getFilters (self, language):
- gEnter (4)
+ assert gEnter (4)
result = self._filter.getFilter (language)
Modified: trunk/gnue-appserver/src/gld/readgld.py
===================================================================
--- trunk/gnue-appserver/src/gld/readgld.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-appserver/src/gld/readgld.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -247,7 +247,7 @@
self.__currentFile, stream = self._files.popitem ()
try:
- gDebug (1, "Loading gld file '%s'" % self.__currentFile)
+ assert gDebug (1, "Loading gld file '%s'" % self.__currentFile)
self.__currentModule = None
self.__currentClass = None
@@ -637,7 +637,7 @@
"unchanged.") \
% {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
- gDebug (1, msg)
+ assert gDebug (1, msg)
print o(msg)
finally:
@@ -670,7 +670,7 @@
"unchanged.") \
% {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
- gDebug (1, msg)
+ assert gDebug (1, msg)
print o(msg)
finally:
Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-appserver/src/language/Object.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -70,7 +70,7 @@
def __getattr__ (self, attr):
- gEnter (6)
+ assert gEnter (6)
name = self.__session.qualify (attr)
key = name.lower ()
@@ -121,7 +121,7 @@
def __setattr__ (self, attr, value):
- gEnter (6)
+ assert gEnter (6)
if self.__dict__.has_key (attr):
self.__dict__ [attr] = value
@@ -211,7 +211,7 @@
def delete (self):
- gEnter (6)
+ assert gEnter (6)
sm = self.__session.getSessionManager ()
sm.delete (self.__sid, self.__class, [self.objectId])
@@ -253,7 +253,7 @@
@return: self for reference properties, None for non-reference properties.
"""
- gEnter (6)
+ assert gEnter (6)
name = self.__session.qualify (attr)
key = name.lower ()
Modified: trunk/gnue-appserver/src/language/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/language/Procedure.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-appserver/src/language/Procedure.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -40,7 +40,7 @@
# Delegate calls of this object to the session manager
# ---------------------------------------------------------------------------
def __call__ (self, **params):
- gEnter (6)
+ assert gEnter (6)
sm = self.__session.getSessionManager ()
sid = self.__session.getSessionId ()
Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-appserver/src/language/Session.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -66,7 +66,7 @@
self.parameters = params
self.classdefs = {}
- gDebug (6, "Built session %s with params %s" % (sessionId, params))
+ assert gDebug (6, "Built session %s with params %s" % (sessionId, params))
# -------------------------------------------------------------------------
@@ -187,7 +187,7 @@
This function closes the encapsulated session on the session manager.
"""
- gEnter (6)
+ assert gEnter (6)
if self.__sm is not None:
self.__sm.close (self.__session_id, None)
@@ -205,7 +205,7 @@
This function commits all pending changes of the session.
"""
- gEnter (6)
+ assert gEnter (6)
if self.__session_id is not None:
self.__sm.commit (self.__session_id)
@@ -222,7 +222,7 @@
This function revokes all pending changes of the current session.
"""
- gEnter (6)
+ assert gEnter (6)
if self.__session_id is not None:
self.__sm.rollback (self.__session_id)
@@ -253,7 +253,7 @@
@return: ObjectList instance with all matching instances of the given class
"""
- gEnter (6)
+ assert gEnter (6)
name = self.qualify (classname)
cdef = self.getClassDefinition (name)
@@ -275,7 +275,7 @@
@return: Object instance of the requested class
"""
- gEnter (6)
+ assert gEnter (6)
result = self._get (classname)
@@ -298,7 +298,7 @@
@return: Object instance of the requested class
"""
- gEnter (6)
+ assert gEnter (6)
name = self.qualify (classname)
cDef = self.getClassDefinition (name)
@@ -324,7 +324,7 @@
@return: Object instance of the requested class
"""
- gEnter (6)
+ assert gEnter (6)
name = self.qualify (classname)
self.__sm.load (self.__session_id, name, [objectId], [u'gnue_id'])
@@ -351,7 +351,7 @@
@return: the message as unicode string
"""
- gEnter (6)
+ assert gEnter (6)
languages = ['C']
current = self.parameters.get ('_language', 'C')
Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/apps/GBaseApp.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -331,9 +331,9 @@
raise StartupError, \
_('The debug_level option ("-d") expects numerical values.')
- gDebug (2, "Python %s" % sys.version)
- gDebug (2, "Run Options: %s" % opt)
- gDebug (2, "Run Arguments: %s" % self.ARGUMENTS)
+ assert gDebug (2, "Python %s" % sys.version)
+ assert gDebug (2, "Run Options: %s" % opt)
+ assert gDebug (2, "Run Arguments: %s" % self.ARGUMENTS)
# Read the config files
if application:
@@ -358,7 +358,7 @@
# Get the connection definitions
if connections != None:
- gDebug(7,"Reusing connections instance")
+ assert gDebug(7,"Reusing connections instance")
self.connections = connections
elif self.USE_CONNECTIONS:
@@ -377,7 +377,7 @@
else:
self.connections_file = os.path.join (paths.config, "connections.conf")
- gDebug(2, 'Connection Definition: "%s"' % self.connections_file)
+ assert gDebug(2, 'Connection Definition: "%s"' % self.connections_file)
try:
self.connections = GConnections.GConnections (self.connections_file,
@@ -647,7 +647,7 @@
'Parameter "%s" specified, but no value supplied.' % psplit [0]
parameters [psplit [0].lower()] = psplit [1]
- gDebug (2,'Param "%s"="%s" ' % (psplit [0].lower(), psplit [1]))
+ assert gDebug (2,'Param "%s"="%s" ' % (psplit [0].lower(), psplit [1]))
return parameters
Modified: trunk/gnue-common/src/apps/GConfig.py
===================================================================
--- trunk/gnue-common/src/apps/GConfig.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/apps/GConfig.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -67,7 +67,7 @@
#
def loadApplicationConfig(self, configFilename="gnue.conf",
homeConfigDir=".gnue", section="DEFAULT", defaults = None):
- gDebug(2,'Reading configuration info from %s section %s' %
(configFilename, section))
+ assert gDebug(2,'Reading configuration info from %s section %s' %
(configFilename, section))
#
# Create parser and populate it if it doesn't exist
@@ -100,7 +100,7 @@
#
try:
parser.read(fileLocations)
- gDebug(2,'Configuration files were read in this order: %s' % \
+ assert gDebug(2,'Configuration files were read in this order: %s' % \
(fileLocations) )
except DuplicateSectionError:
raise InvalidFormatError, _('The file has duplicate source
definitions.')
Modified: trunk/gnue-common/src/apps/GDebug.py
===================================================================
--- trunk/gnue-common/src/apps/GDebug.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/apps/GDebug.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -213,7 +213,7 @@
Write information about the current function and its parameters to
debug-output. This function is available in the global namespace.
- gEnter is intended to be called at the begin of a function.
+ assert gEnter is intended to be called at the begin of a function.
@param level: the debug-level the message will be logged in
@return: Always true so it can be filtered out via assert
Modified: trunk/gnue-common/src/apps/GLogger.py
===================================================================
--- trunk/gnue-common/src/apps/GLogger.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/apps/GLogger.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -76,7 +76,7 @@
for messageset in messages:
for message in string.split("%s" % messageset,'\n'):
- gDebug(2,'>> Logger: [%s] %s' % (timestamp, message))
+ assert gDebug(2,'>> Logger: [%s] %s' % (timestamp, message))
try:
self._filehandle.write('[%s] %s\n' % (timestamp, message))
except IOError, mesg:
Modified: trunk/gnue-common/src/cursing/ColorScheme.py
===================================================================
--- trunk/gnue-common/src/cursing/ColorScheme.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/cursing/ColorScheme.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -81,7 +81,7 @@
self.__dict__['CP_%s'%attr] = (mod, pr)
self.__dict__['C_%s'%attr] = v | mod
- gDebug(5,'C_%s = %s' % (attr, v|mod))
+ assert gDebug(5,'C_%s = %s' % (attr, v|mod))
pair += 1
Modified: trunk/gnue-common/src/cursing/FocusedLabel.py
===================================================================
--- trunk/gnue-common/src/cursing/FocusedLabel.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/cursing/FocusedLabel.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -70,7 +70,7 @@
self.ExecMethod("SYSGOTFOCUS", None, None, None)
def Paint(self, HasFocus, v2, v3):
- gDebug(0,'Workin it')
+ assert gDebug(0,'Workin it')
Container = self.PARENT.Screen()
if self.active:
if HasFocus :
Modified: trunk/gnue-common/src/cursing/Frame.py
===================================================================
--- trunk/gnue-common/src/cursing/Frame.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/cursing/Frame.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -89,7 +89,7 @@
## self.PARENT.Paint()
def _PaintBorder(self):
- gDebug(2,'(!!!) PaintBorder')
+ assert gDebug(2,'(!!!) PaintBorder')
if not self.BORDER:
return
@@ -115,7 +115,7 @@
if self.BORDER:
self._PaintBorder()
else:
- gDebug(0,'PAINTING %s' % self)
+ assert gDebug(0,'PAINTING %s' % self)
for l in range(self._DialogHeight):
self.SCREEN.PrintAt(self.Y+l, self.X, " " * self._DialogWidth,
self.COLOR)
Modified: trunk/gnue-common/src/cursing/Menu.py
===================================================================
--- trunk/gnue-common/src/cursing/Menu.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/cursing/Menu.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -149,7 +149,7 @@
apply(self.GetMethod("CHOSEN"),(self,control.ITEMID,control.TITLE))
def ItemFocused(self,control, arg2,arg3):
- gDebug(0,'I got that focused feeling!')
+ assert gDebug(0,'I got that focused feeling!')
self.ShowStatusBarText(control.DESCRIPTION)
return 1
Modified: trunk/gnue-common/src/cursing/MenuBar.py
===================================================================
--- trunk/gnue-common/src/cursing/MenuBar.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/cursing/MenuBar.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -36,7 +36,7 @@
def __init__(self, Root, Y, X, W, **properties):
Frame.__init__(self, Root, Y, X, Y+1, X + W - 1,
border=0, dropshadow=0, **properties)
- gDebug(0,'WIDTH=%s' % W)
+ assert gDebug(0,'WIDTH=%s' % W)
self.rootwin = Root
self.CANGETFOCUS = 0
self.Y = Y
@@ -55,7 +55,7 @@
return newEntry
def SetStatusBar(self, statusbar, index=0):
- gDebug(0,'SETTING STATUSBAR')
+ assert gDebug(0,'SETTING STATUSBAR')
self.STATUSBAR = statusbar
self.STATUSBAR_INDEX = index
Modified: trunk/gnue-common/src/cursing/StatusBar.py
===================================================================
--- trunk/gnue-common/src/cursing/StatusBar.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/cursing/StatusBar.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -111,7 +111,7 @@
self.SetMethod("SYSGOTFOCUS", None)
self.SetMethod("SYSLOSTFOCUS", None)
- gDebug(1,"X=%s,Y=%s,W=%s, Xs=%s, lenEmpty=%s, Sizes=%s" % \
+ assert gDebug(1,"X=%s,Y=%s,W=%s, Xs=%s, lenEmpty=%s, Sizes=%s" % \
(X, Y, W, self.FIELD_X, len(self._EmptyStatusBar),
Sizes))
Modified: trunk/gnue-common/src/cursing/sio.py
===================================================================
--- trunk/gnue-common/src/cursing/sio.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/cursing/sio.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -97,20 +97,20 @@
def BeginScreenAccess(self):
"""Initialize the screen and setup for action."""
- gDebug(0,'initializing curses screen')
+ assert gDebug(0,'initializing curses screen')
#if self.s <> None:
# return
- gDebug(0,'initializing curses screen 1')
+ assert gDebug(0,'initializing curses screen 1')
self.stdscr = curses.initscr()
self._NegotiateScreenSize()
- gDebug(0,'initializing curses screen 2')
+ assert gDebug(0,'initializing curses screen 2')
self.s = curses.newwin(self.MAXROW+1, self.MAXCOL+1, 0, 0)
curses.noecho()
- gDebug(0,'initializing curses screen 3')
+ assert gDebug(0,'initializing curses screen 3')
#curses.nonl() # disallows usage of <CR> as a selector.
curses.cbreak()
self.s.keypad(1)
- gDebug(0,'initializing curses screen 4')
+ assert gDebug(0,'initializing curses screen 4')
# make the cursor very visible
#curses.curs_set(2) # throws an ERR, removing.
@@ -128,7 +128,7 @@
tiLTEE : curses.ACS_LTEE,
tiRTEE : curses.ACS_RTEE,
tiBULL : curses.ACS_PLUS}
- gDebug(0,'initializing curses screen 5')
+ assert gDebug(0,'initializing curses screen 5')
# TODO: should really only do this if configuration
# TODO: says yes, or on some other test.
@@ -137,7 +137,7 @@
import ColorScheme
if curses.has_colors():
- gDebug(1,"Initializing StandardWhiteOnBlue colors")
+ assert gDebug(1,"Initializing StandardWhiteOnBlue colors")
self.colors = ColorScheme.StandardWhiteOnBlue()
# curses.init_pair(C_SCREEN, curses.COLOR_WHITE,curses.COLOR_BLUE)
@@ -160,7 +160,7 @@
## curses.init_pair(C_STATUSBAR, curses.COLOR_BLACK, curses.COLOR_WHITE)
## curses.init_pair(C_STATUSBAR_FIELD, curses.COLOR_BLUE,
curses.COLOR_WHITE)
else:
- gDebug(1,"Initializing Monochrome colors")
+ assert gDebug(1,"Initializing Monochrome colors")
self.colors = ColorScheme.Monochrome()
Modified: trunk/gnue-common/src/datasources/ConnectionTriggerObj.py
===================================================================
--- trunk/gnue-common/src/datasources/ConnectionTriggerObj.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/ConnectionTriggerObj.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -88,6 +88,6 @@
try:
conn = connections.getConnection (name)
except:
- gDebug (1,"Cannot add connection %s to trigger namespace" % name)
+ assert gDebug (1,"Cannot add connection %s to trigger namespace" % name)
continue
gobjNamespace.constructTriggerObject (ConnectionTriggerObj (conn, name))
Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/datasources/GConnections.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -392,11 +392,11 @@
netrcData = netrc.netrc ().authenticators ("'gnue://%s/'" \
% connection_base)
if netrcData is not None:
- gDebug (7, 'Read the user\'s .netrc file')
+ assert gDebug (7, 'Read the user\'s .netrc file')
loginData ['_username'] = netrcData [0][1:-1]
loginData ['_password'] = netrcData [2][1:-1]
- gDebug (7, "Found useful stuff for connection %s in "
+ assert gDebug (7, "Found useful stuff for connection %s in "
"the user\'s .netrc file" % connection_name)
except (IOError, netrc.NetrcParseError, KeyError):
@@ -466,7 +466,7 @@
attempts = 4
- gDebug (7, 'Getting new data connection to %s' % connection_name)
+ assert gDebug (7, 'Getting new data connection to %s' %
connection_name)
errortext = None
Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/datasources/GDataSource.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -491,7 +491,7 @@
"""
if self.type == 'unbound':
- gDebug (1, "Trying to bind field %s to unbound DataSource" % field)
+ assert gDebug (1, "Trying to bind field %s to unbound DataSource" %
field)
return
self.__fieldReferences [field] = True
@@ -537,7 +537,7 @@
@param defaultValue: optional default value for newly inserted records.
"""
- gDebug (7,'Unbound Field %s implicitly referenced' % field)
+ assert gDebug (7,'Unbound Field %s implicitly referenced' % field)
if defaultValue != None:
self.__defaultData [field] = defaultValue
@@ -786,7 +786,7 @@
# If it's a string or a unicode string, we transform it into a tuple
# sequence, where all items are treated to be in 'ascending' order
if isinstance (order_by, basestring):
- gDebug (1, "DEPRECIATION WARNING: use of 'order_by' attribute is " \
+ assert gDebug (1, "DEPRECIATION WARNING: use of 'order_by' attribute is
" \
"depreciated. Please use <sortorder> instead.")
for field in order_by.split (','):
(item, desc) = (field, field [-5:].lower () == ' desc')
Modified: trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -128,7 +128,7 @@
Create a new database specified by the associated connection.
"""
- gEnter (8)
+ assert gEnter (8)
self._createDatabase_ ()
gLeave (8)
@@ -152,7 +152,7 @@
checktype (schema, GSchema.GSSchema)
- gEnter (8)
+ assert gEnter (8)
self._current = self.readSchema ()
self._diff = self._current.diff (schema, self._maxIdLength_)
@@ -161,8 +161,8 @@
self._lookups = self.__getLookups (self._current)
self._elements = {}
- gDebug (8, "Necessary schema changes:")
- gDebug (8, self._diff.dumpXML ())
+ assert gDebug (8, "Necessary schema changes:")
+ assert gDebug (8, self._diff.dumpXML ())
result = self._writeSchema_ (self._current, self._new, self._diff,
simulation)
@@ -182,7 +182,7 @@
@return: current schema as L{GSchema} object tree.
"""
- gEnter (8)
+ assert gEnter (8)
result = GSchema.GSSchema ()
author = self.__module__.replace ('gnue.common.datasources.drivers.', '')
Modified: trunk/gnue-common/src/datasources/drivers/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Connection.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/Base/Connection.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -168,7 +168,7 @@
@raise errors.AdminError: if the communication with the backend fails.
"""
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._getLoginFields_ ())
@@ -190,7 +190,7 @@
checktype (connectData, dict)
- gEnter (8)
+ assert gEnter (8)
self._connect_ (connectData)
self._beginTransaction_ ()
gLeave (8)
@@ -214,7 +214,7 @@
checktype (table, basestring)
checktype (fields, list)
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._initialize_ (table, fields))
@@ -237,7 +237,7 @@
checktype (table, basestring)
checktype (newfields, dict)
- gEnter (8)
+ assert gEnter (8)
rowid = self._insert_ (table, newfields)
self.__pending = True
return gLeave (8, rowid)
@@ -263,7 +263,7 @@
checktype (oldfields, dict)
checktype (newfields, dict)
- gEnter (8)
+ assert gEnter (8)
self._update_ (table, oldfields, newfields)
self.__pending = True
gLeave (8)
@@ -287,7 +287,7 @@
checktype (table, basestring)
checktype (oldfields, dict)
- gEnter (8)
+ assert gEnter (8)
self._delete_ (table, oldfields)
self.__pending = True
gLeave (8)
@@ -314,7 +314,7 @@
checktype (oldfields, dict)
checktype (fields, list)
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._requery_ (table, oldfields, fields))
@@ -341,7 +341,7 @@
checktype (methodname, basestring)
checktype (parameters, dict)
- gEnter (8)
+ assert gEnter (8)
result = self._call_ (table, oldfields, methodname, parameters)
# FIXME: Some calls should not make the connection pending, like requesting
# the generated form. Most others should.
@@ -376,7 +376,7 @@
the backend.
"""
- gEnter (8)
+ assert gEnter (8)
self._commit_ ()
self.__pending = False
self._beginTransaction_ ()
@@ -395,7 +395,7 @@
on the backend.
"""
- gEnter (8)
+ assert gEnter (8)
self._rollback_ ()
self.__pending = False
self._beginTransaction_ ()
@@ -414,7 +414,7 @@
the backend.
"""
- gEnter (8)
+ assert gEnter (8)
self._close_ ()
gLeave (8)
Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -533,7 +533,7 @@
if self.__readonly:
raise Exceptions.ReadOnlyInsertError
- gDebug (8, 'Inserting a blank record in %s' % self)
+ assert gDebug (8, 'Inserting a blank record in %s' % self)
self.__recordCount += 1
self.__currentRecord += 1
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -112,7 +112,7 @@
def _connect_ (self, connectData):
(params, kwargs) = self._getConnectParams_ (connectData)
- gDebug (3, 'DBSIG2 Connect')
+ assert gDebug (3, 'DBSIG2 Connect')
try:
self._native = self._driver.connect (*params, **kwargs)
except self._driver.DatabaseError:
@@ -178,7 +178,7 @@
# ---------------------------------------------------------------------------
def _commit_ (self):
- gDebug (3, 'DBSIG2 Commit')
+ assert gDebug (3, 'DBSIG2 Commit')
try:
self._native.commit ()
except self._driver.DatabaseError:
@@ -187,14 +187,14 @@
# ---------------------------------------------------------------------------
def _rollback_ (self):
- gDebug (3, 'DBSIG2 Rollback')
+ assert gDebug (3, 'DBSIG2 Rollback')
if hasattr (self._native, 'rollback'):
self._native.rollback ()
# ---------------------------------------------------------------------------
def _close_ (self):
- gDebug (3, 'DBSIG2 Close')
+ assert gDebug (3, 'DBSIG2 Close')
if self._native:
self._native.close ()
@@ -358,8 +358,8 @@
else:
p = None
- gDebug (3, "DBSIG2 Statement: %s" % s)
- gDebug (3, "DBSIG2 Parameters: %s" % p)
+ assert gDebug (3, "DBSIG2 Statement: %s" % s)
+ assert gDebug (3, "DBSIG2 Parameters: %s" % p)
# Create DBSIG2 cursor and execute statement
cursor = self._native.cursor ()
Modified: trunk/gnue-common/src/datasources/drivers/sql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/__init__.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/sql/__init__.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -19,7 +19,7 @@
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: __init__.py 7615 2005-06-17 15:24:00Z reinhard $
+# $Id$
"""
Database driver plugins for SQL based backends.
Modified: trunk/gnue-common/src/datasources/drivers/sql/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/interbase/__init__.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/sql/interbase/__init__.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -19,7 +19,7 @@
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: csvfile.py 7615 2005-06-17 15:24:00Z reinhard $
+# $Id$
"""
Database driver plugins for Firebird/Interbase backends.
Modified:
trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -120,7 +120,7 @@
self._ib_encoding = ib_encTable [self._encoding]
else:
self._ib_encoding = ''
- gDebug (1, "Encoding '%s' is not supported by interbase dbdriver. "
+ assert gDebug (1, "Encoding '%s' is not supported by interbase dbdriver.
"
"Using default encoding." % self._encoding)
Modified: trunk/gnue-common/src/datasources/drivers/sql/msado/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/msado/__init__.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/sql/msado/__init__.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -19,7 +19,7 @@
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: csvfile.py 7615 2005-06-17 15:24:00Z reinhard $
+# $Id$
"""
Database driver plugins for MS-ADO backends.
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -59,7 +59,7 @@
self._pg_encoding = pg_encTable [self._encoding]
else:
self._pg_encoding = ''
- gDebug (1, "Encoding '%s' is not supported by postgresql dbdriver. "
+ assert gDebug (1, "Encoding '%s' is not supported by postgresql
dbdriver. "
"Using default encoding." % self._encoding)
Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/definitions/GParser.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -162,7 +162,7 @@
object.walk(addAttributesWalker,attributes=attributes)
if initialize:
- gDebug (7, "Initializing the object tree starting at %s" %(object))
+ assert gDebug (7, "Initializing the object tree starting at %s" %(object))
object.phaseInit(dh._phaseInitCount)
# Break the cyclic reference in the content handler, so garbage collection is
@@ -296,7 +296,7 @@
#
# No namespace qualifier
#
- gDebug (7, "<%s>" % name)
+ assert gDebug (7, "<%s>" % name)
try:
baseAttrs = self.xmlElements[name].get('Attributes',{})
@@ -400,7 +400,7 @@
# namespace qualifier and we are masquerading
#
- gDebug (7, "<%s:%s>" % (ns,name))
+ assert gDebug (7, "<%s:%s>" % (ns,name))
for qattr in saxattrs.keys():
attrns, attr = qattr
@@ -504,7 +504,7 @@
inits = child._buildObject()
self._phaseInitCount = (inits != None and inits > self._phaseInitCount \
and inits or self._phaseInitCount)
- gDebug (7, "</%s>" % name)
+ assert gDebug (7, "</%s>" % name)
@@ -557,7 +557,7 @@
for key in self._loadedxmlattrs.keys():
if key[0] != '_':
rv.__dict__[key] = self._loadedxmlattrs[key]
- gDebug (7, ">>> Moving %s" % key)
+ assert gDebug (7, ">>> Moving %s" % key)
rv._buildObject()
else:
raise MarkupError, \
Modified: trunk/gnue-common/src/definitions/GParserHelpers.py
===================================================================
--- trunk/gnue-common/src/definitions/GParserHelpers.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/definitions/GParserHelpers.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -19,7 +19,7 @@
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: $
+# $Id$
from xml.sax import saxutils
from types import StringType
Modified: trunk/gnue-common/src/formatting/masks/Masks.py
===================================================================
--- trunk/gnue-common/src/formatting/masks/Masks.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-common/src/formatting/masks/Masks.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -51,27 +51,27 @@
key = (numeric, date, mask)
try:
handler = self._inputMaskMap[key]
- gDebug(7,'Reusing existing mask for %s' % mask)
+ assert gDebug(7,'Reusing existing mask for %s' % mask)
except KeyError:
- gDebug(7,'Creating mask handler for %s' % mask)
+ assert gDebug(7,'Creating mask handler for %s' % mask)
handler = self._inputMaskMap[key] = _InputMask(mask, numeric, date)
return handler
def getFormatMask(self, mask, style="default", ):
try:
handler = self._maskMap[mask]
- gDebug(7,'Reusing existing mask for %s' % mask)
+ assert gDebug(7,'Reusing existing mask for %s' % mask)
except KeyError:
- gDebug(7,'Creating mask handler for %s' % mask)
+ assert gDebug(7,'Creating mask handler for %s' % mask)
handler = self._maskMap[mask] = None
return handler
def getValidationMask(self, mask, style="default", ):
try:
handler = self._maskMap[mask]
- gDebug(7,'Reusing existing mask for %s' % mask)
+ assert gDebug(7,'Reusing existing mask for %s' % mask)
except KeyError:
- gDebug(7,'Creating mask handler for %s' % mask)
+ assert gDebug(7,'Creating mask handler for %s' % mask)
handler = self._maskMap[mask] = None
return handler
Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/logic/GTrigger.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -288,7 +288,7 @@
self._trigger[key] = []
self._trigger[key].append(function)
else:
- gDebug (0, "%s %s" % (_("Invalid trigger "), key))
+ assert gDebug (0, "%s %s" % (_("Invalid trigger "), key))
def processTrigger(self, key, ignoreAbort=True):
"""
@@ -305,7 +305,7 @@
"""
key = string.upper(key)
if key in self._validTriggers.keys():
- gDebug (9, 'Trigger %s on %s' % (key, repr (self)))
+ assert gDebug (9, 'Trigger %s on %s' % (key, repr (self)))
if self._trigger.has_key(key):
for function in self._trigger[key]:
# TODO: do we need to call "updateNamespace" here?
@@ -316,7 +316,7 @@
if not ignoreAbort:
raise
else:
- gDebug (0, "%s: %s %s" % (self._type, _("Invalid trigger "), key))
+ assert gDebug (0, "%s: %s %s" % (self._type, _("Invalid trigger "), key))
#print self._type,": ",_("Invalid trigger "),key
def getXMLelements(updates={}):
Modified: trunk/gnue-common/src/rpc/drivers/Base.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/Base.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-common/src/rpc/drivers/Base.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -177,7 +177,7 @@
@returns: L{ServerProxy} instance handling attribute access and method
calls
"""
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._getServerProxy_ ())
@@ -254,7 +254,7 @@
Note: not all RPC adapter can handle keyword arguments, so take care.
"""
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._adapter._callMethod_ (self._methodname, *args,
**params))
@@ -340,7 +340,7 @@
Start the server.
"""
- gEnter (8)
+ assert gEnter (8)
return gLeave (8, self._serve_ ())
Modified: trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -60,9 +60,9 @@
# to our internal "service directory"
self.mapObjects(rpcdef,bindings)
- gDebug (8, 'XML-RPC Service Directory:\n * %s' % \
+ assert gDebug (8, 'XML-RPC Service Directory:\n * %s' % \
string.join(self.directory.keys(),'\n * '))
- gDebug (8,'XML-RPC Service Directory:\n%s' % \
+ assert gDebug (8,'XML-RPC Service Directory:\n%s' % \
self.directory.keys())
self._dispatchers=[self.methodDispatcher]
@@ -109,8 +109,8 @@
# the direct mapping
if bindings.has_key(object.binding):
- gDebug (8, 'GNURPC Binding Information:');
- gDebug (8, ' * %s is bound to \n * %s' % \
+ assert gDebug (8, 'GNURPC Binding Information:');
+ assert gDebug (8, ' * %s is bound to \n * %s' % \
(object.binding,bindings[object.binding]))
# for services create an "static" object
@@ -143,7 +143,7 @@
object._realbinding=getattr(parent._realbinding,\
object.name)
- gDebug (8, '* %s is bound to \n * %s' % \
+ assert gDebug (8, '* %s is bound to \n * %s' % \
(object._path,object._realbinding))
except:
tmsg = u_("GNURPC cannot bind service '%(name)s' to service "
@@ -176,7 +176,7 @@
if parent._type == 'RpService':
try:
bindto=getattr(parent._realbinding,object.name)
- gDebug (8,'* %s is bound to \n * %s' % \
+ assert gDebug (8,'* %s is bound to \n * %s' % \
(object._path,bindto))
except:
tmsg = u_("GNURPC cannot bind method/attribut '%(name)s' to "
@@ -262,7 +262,7 @@
if not self.directory.has_key (method):
raise MethodNotFoundError, method
- gDebug (8, 'GNURPC Directory entry:\n (%s,%s,%s)' % \
+ assert gDebug (8, 'GNURPC Directory entry:\n (%s,%s,%s)' % \
(self.directory [method]['signature'],\
self.directory [method]['help'],\
self.directory [method]['binding']))
@@ -291,7 +291,7 @@
if rtype:
# check for empty results (not allowed for XMLRPC)
if (result==None) or (result==[None]):
- gDebug (8,'Transform result None into 1')
+ assert gDebug (8,'Transform result None into 1')
result=1
return result
@@ -353,7 +353,7 @@
mparts.reverse()
calltype=mparts[0]
calltype=calltype[:4]
- gDebug (8,'method %s has calling type %s' % (method,calltype))
+ assert gDebug (8,'method %s has calling type %s' % (method,calltype))
if calltype=='set_':
# setAttribut method
Modified: trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -256,7 +256,7 @@
class _ProxyObject(Base.ProxyObject):
def __call__(self, *args, **params):
- gDebug (3, "%s (%s)" \
+ assert gDebug (3, "%s (%s)" \
% (self.__service,
string.join ([repr (x) for x in args] + \
["%s = %s" % (x [0], repr (x [1])) \
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -159,7 +159,7 @@
data-type, or a result cannot be converted into a native python type
"""
- gEnter (9)
+ assert gEnter (9)
checktype (method, basestring)
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -96,7 +96,7 @@
@returns: result of the method given in RPC types
"""
- gEnter (9)
+ assert gEnter (9)
checktype (method, basestring)
checktype (parameters, tuple)
@@ -151,7 +151,7 @@
Log all requests at debug level 9.
"""
- gDebug (9, '"%s" %s %s' % (self.requestline, code, size))
+ assert gDebug (9, '"%s" %s %s' % (self.requestline, code, size))
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/utils/http.py
===================================================================
--- trunk/gnue-common/src/utils/http.py 2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-common/src/utils/http.py 2005-09-12 14:31:40 UTC (rev 7898)
@@ -198,7 +198,7 @@
if message is not None:
data += message
- gDebug (2, "batch: %s" % self._buffer)
+ assert gDebug (2, "batch: %s" % self._buffer)
self.wfile.write (data)
self.wfile.flush ()
Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py 2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/GFClient.py 2005-09-12 14:31:40 UTC (rev 7898)
@@ -105,7 +105,7 @@
that will control the application.
"""
- gEnter (4)
+ assert gEnter (4)
# -------------------------------------------------------------------------
# User interface setup
@@ -113,7 +113,7 @@
if gConfigForms ('disableSplash') == True:
self.disableSplash = True
- gDebug (4, "Loading user interface driver")
+ assert gDebug (4, "Loading user interface driver")
SPECIFIC_UI = bool(self.OPTIONS ['user_interface'])
if SPECIFIC_UI:
@@ -125,16 +125,16 @@
break
except ImportError, err:
- gDebug (1, "Unknown UI Driver: %s" % self.ui_type)
- gDebug (1, err)
+ assert gDebug (1, "Unknown UI Driver: %s" % self.ui_type)
+ assert gDebug (1, err)
try:
self._ui = dyn_import ("%s" % self.ui_type.replace ('/', '.'))
break
except ImportError, err:
- gDebug (1, "Unknown UI Driver: %s" % self.ui_type)
- gDebug (1, err)
+ assert gDebug (1, "Unknown UI Driver: %s" % self.ui_type)
+ assert gDebug (1, err)
raise StartupError, \
u_("Unknown UI driver specified: %s") % self.ui_type
@@ -152,13 +152,13 @@
# User supplied parameters are a way of passing initial values into form
# variables from the command line
#
- gDebug (4, "Parsing command line parameters")
+ assert gDebug (4, "Parsing command line parameters")
userParameters = self.getCommandLineParameters (self.ARGUMENTS [1:])
# Create the instance that will control the loaded form(s)
- gDebug (4, "Creating GFInstance object")
+ assert gDebug (4, "Creating GFInstance object")
instance = GFInstance (self, self.connections, self._ui,
self.disableSplash, userParameters)
@@ -190,13 +190,13 @@
else:
raise StartupError, u_("No Forms Definition File Specified.")
- gDebug (4, "Parsing form definition")
+ assert gDebug (4, "Parsing form definition")
instance.addFormFromFile (formfile)
- gDebug (4, "Activating form")
+ assert gDebug (4, "Activating form")
instance.activate ()
- gDebug (4, "Closing all connections")
+ assert gDebug (4, "Closing all connections")
self.getConnectionManager ().closeAll ()
gLeave (4)
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/GFForm.py 2005-09-12 14:31:40 UTC (rev 7898)
@@ -286,7 +286,7 @@
"""
if object._type == 'GFField':
- gDebug (5, "GFField was passed to 'findFocus'.")
+ assert gDebug (5, "GFField was passed to 'findFocus'.")
try:
object = object._entryList[0]
except IndexError:
@@ -350,12 +350,12 @@
# cannot change focus to same entry
if widget == self._currentEntry:
- gDebug (5, "Current entry did not change from %s" % widget)
+ assert gDebug (5, "Current entry did not change from %s" % widget)
return
cen = self._currentEntry is not None and self._currentEntry.name or '-'
win = widget is not None and widget.name or '-'
- gDebug (5, "Changing focus from %s (%s) to %s (%s)" % \
+ assert gDebug (5, "Changing focus from %s (%s) to %s (%s)" % \
(self._currentEntry, cen, widget, win))
try:
@@ -422,7 +422,7 @@
if blockChange:
self.refreshDisplay(self._currentBlock)
- gDebug (5, "Updating entries old: %s, new: %s" % \
+ assert gDebug (5, "Updating entries old: %s, new: %s" % \
(oldEntry, self._currentEntry))
self.dispatchEvent('updateENTRY', oldEntry, _form=self)
@@ -445,12 +445,12 @@
if pageChange:
self._currentPage.processTrigger('Post-FocusIn', ignoreAbort=False)
- gDebug (5, "calling refreshUIEvents ()")
+ assert gDebug (5, "calling refreshUIEvents ()")
self.refreshUIEvents()
- gDebug (5, "CurrentEntry is %s" % self._currentEntry)
+ assert gDebug (5, "CurrentEntry is %s" % self._currentEntry)
except AbortRequest, t:
- gDebug (5, "Trigger Error!")
+ assert gDebug (5, "Trigger Error!")
message = _("Trigger Exception :\n") + t.message
return message
@@ -540,7 +540,7 @@
block.processRollback()
for entry in block._entryList:
if hasattr(entry, 'queryDefault'):
- gDebug (5, "%s will be set to %s" % (entry.name, entry.queryDefault))
+ assert gDebug (5, "%s will be set to %s" % (entry.name,
entry.queryDefault))
entry.setValue(entry.queryDefault)
# If Enter-Query is hit once, enter query mode
@@ -641,7 +641,7 @@
@return: None if all went well, error message otherwise
"""
- gEnter (4)
+ assert gEnter (4)
self.endEditing ()
if self.readonly:
@@ -662,18 +662,18 @@
self.processTrigger ('Pre-Commit', ignoreAbort = False)
except AbortRequest:
- gDebug (5, "Trigger form Pre-Commit threw a AbortRequest!")
+ assert gDebug (5, "Trigger form Pre-Commit threw a AbortRequest!")
message = u_("Form trigger returned error")
# Process the commit on all blocks
for block in self._logic._blockList:
- gDebug (5, "Saving %s" % block.name)
+ assert gDebug (5, "Saving %s" % block.name)
try:
block.processCommit ()
except AbortRequest:
- gDebug (5, "Trigger block Pre-Commit threw a AbortRequest!")
+ assert gDebug (5, "Trigger block Pre-Commit threw a AbortRequest!")
message = u_("Block trigger returned error")
# jump to offending block
newBlock = block
@@ -960,7 +960,7 @@
"""
block = self._currentBlock
if not block:
- gDebug(5,'No current block - cannot refresh UI')
+ assert gDebug(5,'No current block - cannot refresh UI')
return
dispatchEvent = self.dispatchEvent
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/GFInstance.py 2005-09-12 14:31:40 UTC (rev 7898)
@@ -76,10 +76,10 @@
# moduleName is here only for Designer to be able to pass it in
#when debugging a form.
- gEnter (4)
+ assert gEnter (4)
# Configure event handling
- gDebug (4, "Initializing event handling")
+ assert gDebug (4, "Initializing event handling")
self.eventController = events.EventController ()
events.EventAware.__init__ (self, self.eventController)
@@ -154,7 +154,7 @@
# Construct an instance of the UI driver if an UI module is available
if self._uimodule is not None:
- gDebug (4, "Initializing user interface driver")
+ assert gDebug (4, "Initializing user interface driver")
self._uiinstance = self._uimodule.GFUserInterface (self.eventController,
disableSplash = self._disableSplash,
parentContainer = self._parentContainer,
@@ -294,19 +294,19 @@
def activate (self):
- gEnter (4)
+ assert gEnter (4)
# Initialize all the forms loaded into memory
- gDebug (4, "Initializing form objects")
+ assert gDebug (4, "Initializing form objects")
for formObject in self._formsDictionary.values ():
formObject.phaseInit ()
- gDebug (4, "Initializing user interface driver object")
+ assert gDebug (4, "Initializing user interface driver object")
self._uiinstance.initialize ()
# Build the UIs for all the forms
- gDebug (4, "Building forms")
+ assert gDebug (4, "Building forms")
for dialog in self._formsDictionary.keys ():
self.buildForm (dialog)
@@ -317,17 +317,17 @@
# we assume a dialog to be modal by definition and that program execution
# stops here until the dialog get's closed. So do *not* enter another
# main loop
- gDebug (4, "Activating main form as dialog")
+ assert gDebug (4, "Activating main form as dialog")
self.activateForm ('__main__', modal = True)
else:
- gDebug (4, "Activating main form")
+ assert gDebug (4, "Activating main form")
self.activateForm ('__main__')
- gDebug (4, "Startup complete")
- gDebug (4, "Entering main loop")
+ assert gDebug (4, "Startup complete")
+ assert gDebug (4, "Entering main loop")
self._uiinstance.mainLoop ()
- gDebug (4, "Returning from main loop")
+ assert gDebug (4, "Returning from main loop")
gLeave (4)
@@ -338,7 +338,7 @@
def activateForm (self, formName = '__main__', parameters = {}, modal = 0):
- gEnter (4)
+ assert gEnter (4)
form = self._formsDictionary [formName]
@@ -349,18 +349,18 @@
raise errors.ApplicationError, \
u_("There are no navigable widgets in this form. Unable to display.")
- gDebug (4, "Processing activation trigger")
+ assert gDebug (4, "Processing activation trigger")
form.processTrigger ('On-Activation')
# First set the current entry to be focused and up to date before
# displaying the real UI form.
- gDebug (4, "Initial display setup")
+ assert gDebug (4, "Initial display setup")
form.refreshDisplay (form)
self.updateStatus (form)
- gDebug (4, "Setting initial focus")
+ assert gDebug (4, "Setting initial focus")
self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
- gDebug (4, "Activating form")
+ assert gDebug (4, "Activating form")
self._uiinstance.activateForm (formName, modal)
gLeave (4)
@@ -1179,7 +1179,7 @@
message = event._form.commit ()
if message:
self.displayMessageBox (message, 'Commit Error')
- gDebug(4,message)
+ assert gDebug(4,message)
return
self._entryUpdated (event._form)
Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -559,7 +559,7 @@
# processCommit
#
def processCommit(self):
- gDebug (4, "processing commit on block %s"%self.name,1)
+ assert gDebug (4, "processing commit on block %s"%self.name,1)
self.mode='commit'
Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-forms/src/GFObjects/GFField.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -444,7 +444,7 @@
# Remember the resultSet for later
self.__fk_resultSet = resultSet
- gDebug (5,'Created for DropDown: %s' % self._allowedValues)
+ assert gDebug (5,'Created for DropDown: %s' % self._allowedValues)
def allowedValues(self):
return (self._allowedValues, self._allowedValuesDescr)
Modified: trunk/gnue-forms/src/input/displayHandlers/Base.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Base.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/input/displayHandlers/Base.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -50,7 +50,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: _moveCursor not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: _moveCursor not supported." % self.entry.name
)
return
def _moveCursorLeft(self, event, selecting=False):
@@ -59,7 +59,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: _moveCursorLeft not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: _moveCursorLeft not supported." %
self.entry.name )
return
def _moveCursorRight(self, event, selecting=False):
@@ -68,7 +68,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: _moveCursorRight not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: _moveCursorRight not supported." %
self.entry.name )
return
def _moveCursorToEnd(self, event, selecting=False):
@@ -77,7 +77,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: _moveCursorToEnd not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: _moveCursorToEnd not supported." %
self.entry.name )
return
def _moveCursorToBegin(self, event, selecting=False):
@@ -86,7 +86,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: _moveCursosToBegin not supported." % self.entry.name
)
+ assert gDebug (5, "Entry %s: _moveCursosToBegin not supported." %
self.entry.name )
return
def backspace(self, event):
@@ -95,7 +95,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: backspace not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: backspace not supported." % self.entry.name )
return
# Delete forward one character
@@ -105,7 +105,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: delete not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: delete not supported." % self.entry.name )
return
# ---------------------------------------------------------------------------
@@ -118,7 +118,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: setSelectionArea not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: setSelectionArea not supported." %
self.entry.name )
return
@@ -128,7 +128,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: getSelectionArea not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: getSelectionArea not supported." %
self.entry.name )
return
@@ -138,7 +138,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: selectAll not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: selectAll not supported." % self.entry.name )
return
def selectLeft(self, event):
@@ -147,7 +147,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: selectLeft not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: selectLeft not supported." % self.entry.name )
return
@@ -157,7 +157,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: selectRight not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: selectRight not supported." % self.entry.name
)
return
@@ -167,7 +167,7 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: selectToBegin not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: selectToBegin not supported." %
self.entry.name )
return
@@ -177,6 +177,6 @@
Not supported by base. Use BaseCursor.
"""
- gDebug (5, "Entry %s: selectToEnd not supported." % self.entry.name )
+ assert gDebug (5, "Entry %s: selectToEnd not supported." % self.entry.name
)
return
Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -144,7 +144,7 @@
Function to emit an event that will cause forms
to update the UI.
"""
- gDebug (5, "generateRefreshEvent on %s '%s' %s" % \
+ assert gDebug (5, "generateRefreshEvent on %s '%s' %s" % \
(self, self.display, self.entry))
# TODO: this should probably actually happen in UIwxpython!
@@ -255,7 +255,7 @@
# Skip if this display handler isn't the one currently being edited
if not self.editing:
- gDebug(5,
+ assert gDebug(5,
"Entry %s: Received request to add text but isn't in edit mode" %
self.entry.name )
return
@@ -276,7 +276,7 @@
len(self.work) + len(value) > self.field.maxLength:
# TODO: Should we beep?
self.__beep()
- gDebug (6, "Entry %s: Max length reached" % self.entry.name )
+ assert gDebug (6, "Entry %s: Max length reached" % self.entry.name )
return
if ( self.field._numeric and \
@@ -284,7 +284,7 @@
for char in value:
if not (char.isdigit() or char in '.-') :
# TODO: Should we beep?
- gDebug (6, "Entry %s: Invalid numeric input" % self.entry.name)
+ assert gDebug (6, "Entry %s: Invalid numeric input" %
self.entry.name)
return
# -------------------------------------------------------------------------
@@ -336,7 +336,7 @@
Insert text at specified position
"""
if not self.editing:
- gDebug(5,
+ assert gDebug(5,
"Entry %s: Received request to insert text but not in edit mode" %
self.entry.name )
return
@@ -354,7 +354,7 @@
@param event: The GFEvent making the request
"""
if not self.editing:
- gDebug(5,
+ assert gDebug(5,
"Entry %s: Received request to delete text but not in edit mode" %
self.entry.name )
return
@@ -388,7 +388,7 @@
@param event: The GFEvent making the request
"""
if not self.editing:
- gDebug(5,
+ assert gDebug(5,
"Entry %s: Received request to backspace but not in edit mode" %
self.entry.name )
return
@@ -415,7 +415,7 @@
@param event: The GFEvent making the request
"""
if not self.editing:
- gDebug(5,
+ assert gDebug(5,
"Entry %s: Received request to delete text but not in edit mode" %
self.entry.name )
return
Modified: trunk/gnue-forms/src/input/displayHandlers/DateTime.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/DateTime.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/input/displayHandlers/DateTime.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -75,7 +75,7 @@
tempVal = time.strptime (self.work, self.__inputMask)
self.value = datetime.datetime(*tempVal[0:6])
except ValueError:
- gDebug(6,"Date format %s invalid for mask %s" % (self.work,
self.__inputMask))
+ assert gDebug(6,"Date format %s invalid for mask %s" % (self.work,
self.__inputMask))
return False
return True
Modified: trunk/gnue-forms/src/input/displayHandlers/Password.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Password.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/input/displayHandlers/Password.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -83,7 +83,7 @@
This is disabled for password field types.
"""
- gDebug(4, "Entry %s: Password style entry. Copy disabled." %
self.entry.name)
+ assert gDebug(4, "Entry %s: Password style entry. Copy disabled." %
self.entry.name)
def _clipboardCut(self, event):
"""
@@ -92,4 +92,4 @@
This is disabled for password field types.
"""
- gDebug(4, "Entry %s: Password style entry. Cut disabled." %
self.entry.name)
+ assert gDebug(4, "Entry %s: Password style entry. Cut disabled." %
self.entry.name)
Modified: trunk/gnue-forms/src/input/displayHandlers/__init__.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/__init__.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/input/displayHandlers/__init__.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -65,7 +65,7 @@
else:
key = entry.style
- gDebug(6, "Creating display handler for entry key %s" % key)
+ assert gDebug(6, "Creating display handler for entry key %s" % key)
try:
constructor = classConstructors[key]
except KeyError:
Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -167,9 +167,9 @@
raise ImportError, mesg
except ImportError, mesg:
- gDebug (1, "%s.widgets.%s doesn't appear to be a valid ui widget" \
+ assert gDebug (1, "%s.widgets.%s doesn't appear to be a valid ui
widget" \
% (uiDriver, widgetName))
- gDebug (1, ' --> %s' % mesg)
+ assert gDebug (1, ' --> %s' % mesg)
self._uiFocusWidget = None
@@ -288,10 +288,10 @@
if not uiWidget.widgets == []:
self._gfObjToToolkitWidgets [object] = uiWidget.widgets
- gDebug (5, "Widget is %s" % uiWidget.widgets)
+ assert gDebug (5, "Widget is %s" % uiWidget.widgets)
except KeyError:
- gDebug(4, "KeyError in _buildUI")
+ assert gDebug(4, "KeyError in _buildUI")
#############################################################################
@@ -384,12 +384,12 @@
record = block._resultSet.getRecord (currentRecord - (index - count))
value = handler.getDisplayFiller (record.getField (field.field))
- gDebug (5, "UPD-ENTRY %s prior: '%s' (%s)" % (entry, value, count))
+ assert gDebug (5, "UPD-ENTRY %s prior: '%s' (%s)" % (entry, value,
count))
self._gfObjToUIWidget [entry].setValue (value, count)
# Fill current spot
value = handler.getDisplayFiller (entry.getValue ())
- gDebug (5, "UPD-ENTRY %s current: '%s' (%s)" % (entry, value, index))
+ assert gDebug (5, "UPD-ENTRY %s current: '%s' (%s)" % (entry, value,
index))
self._gfObjToUIWidget [entry].setValue (value, index)
# Fill trailing spots
@@ -412,7 +412,7 @@
else:
value = handler.getDisplayFiller (rec.getField (field.field))
- gDebug (5, "UPD-ENTRY %s trail: '%s' (%s)" % (entry, value, count))
+ assert gDebug (5, "UPD-ENTRY %s trail: '%s' (%s)" % (entry, value,
count))
self._gfObjToUIWidget [entry].setValue (value, count, cr <= lastRow)
count += 1
@@ -427,7 +427,7 @@
index = event.object._visibleIndex
widget = self._gfObjToUIWidget [event.object]
- gDebug (5, "UPD-ENTRY-ED %s '%s' %s" % (event.object, event.display,
index))
+ assert gDebug (5, "UPD-ENTRY-ED %s '%s' %s" % (event.object,
event.display, index))
widget.setValue (event.display, index)
widget.setCursorPosition (event.cursor, index)
@@ -442,7 +442,7 @@
def getClipboardContents (self, event):
- gDebug (5, "Getting clipboard '%s'" % self.__clipboard)
+ assert gDebug (5, "Getting clipboard '%s'" % self.__clipboard)
event.__result__ = "%s" % self.__clipboard
@@ -452,7 +452,7 @@
def setClipboardContents (self, event):
- gDebug (5, "Setting clipboard '%s'" % event.text)
+ assert gDebug (5, "Setting clipboard '%s'" % event.text)
self.__clipboard = "%s" % event.text
Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -313,8 +313,8 @@
# Give us a chance to debug exceptions until we have a 'good' exception
# dialog
- gDebug (2, "MESSAGE: %s" % message)
- gDebug (2, "Detail : %s" % detail)
+ assert gDebug (2, "MESSAGE: %s" % message)
+ assert gDebug (2, "Detail : %s" % detail)
self.showMessage (message, kind = 'Error')
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -133,9 +133,9 @@
def setCursorPosition (self, position, index = 0):
- gDebug (2, "----- new position: %s" % position)
- gDebug (2, " Value : %r" % self.__value [index])
- gDebug (2, " Curr.Offset : %s/%s" % (self.__offset [index],
+ assert gDebug (2, "----- new position: %s" % position)
+ assert gDebug (2, " Value : %r" % self.__value [index])
+ assert gDebug (2, " Curr.Offset : %s/%s" % (self.__offset [index],
self.__voffset [index]))
if self.__style in ['checkbox', 'listbox']:
@@ -155,8 +155,8 @@
value = self.__value [index][:position+1]
vcorr = [0, 1][value [-1] == '\n']
- gDebug (2, " Cut-Part : %r" % value)
- gDebug (2, " Vert.Correct: %s" % vcorr)
+ assert gDebug (2, " Cut-Part : %r" % value)
+ assert gDebug (2, " Vert.Correct: %s" % vcorr)
# Get the vertical cursor-position and offset
cpVertical = value.count ('\n') - self.__voffset [index] - vcorr
@@ -200,7 +200,7 @@
cpVertical = min (cpVertical, self.__height - 1)
cpVertical = max (cpVertical, 0)
- gDebug (2, "H/V: %s/%s - Offsets %s/%s" % (cpHorizontal, cpVertical,
+ assert gDebug (2, "H/V: %s/%s - Offsets %s/%s" % (cpHorizontal,
cpVertical,
self.__offset [index], self.__voffset [index]))
self._setCursor (cpHorizontal, cpVertical)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -69,7 +69,7 @@
def addAction (self, name, userAction):
- gDebug (6, "TOOL: add action %s, %s" % \
+ assert gDebug (6, "TOOL: add action %s, %s" % \
(repr (name), repr (userAction.description)))
label = name
@@ -78,7 +78,7 @@
# Set the action icon if available
if not iconloc:
- gDebug (1, "Cannot add '%s' to toolbar; no icon" % userAction.event)
+ assert gDebug (1, "Cannot add '%s' to toolbar; no icon" %
userAction.event)
return
icon = gtk.Image ()
Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -127,7 +127,7 @@
(self.textWidth, self.textHeight) = sr
- gDebug (6, "Metrics %s x %s" % (self.textWidth, self.textHeight))
+ assert gDebug (6, "Metrics %s x %s" % (self.textWidth, self.textHeight))
self.widgetWidth = self.textWidth
self.widgetHeight = self.textHeight
@@ -236,18 +236,18 @@
def getClipboardContents (self, event):
- gDebug (6, "Retrieving clipboard contents")
+ assert gDebug (6, "Retrieving clipboard contents")
widget = self._UIform.mainWindow.get_focus ()
if isinstance (widget, gtk.TextView):
- gDebug (6, "Clipboard is %s" % self._clipboard)
+ assert gDebug (6, "Clipboard is %s" % self._clipboard)
tBuffer = widget.get_buffer ()
pos = tBuffer.get_iter_at_mark (tBuffer.get_insert ())
tBuffer.paste_clipboard (self._clipboard, pos, widget.get_editable())
elif hasattr (widget, 'paste_clipboard'):
- gDebug (6, "calling %s.paste_clipboard" % widget)
+ assert gDebug (6, "calling %s.paste_clipboard" % widget)
widget.paste_clipboard ()
event.__result__ = None
@@ -259,7 +259,7 @@
def setClipboardContents (self, event):
- gDebug (6, "Setting clipboard contents")
+ assert gDebug (6, "Setting clipboard contents")
widget = self._UIform.mainWindow.get_focus ()
if isinstance (widget, gtk.TextView):
@@ -267,7 +267,7 @@
tBuffer.copy_clipboard (self._clipboard)
if hasattr (widget, 'copy_clipboard'):
- gDebug (6, "calling %s.copy_clipboard ()" % widget)
+ assert gDebug (6, "calling %s.copy_clipboard ()" % widget)
widget.copy_clipboard ()
Modified: trunk/gnue-forms/src/uidrivers/gtk2/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/common.py 2005-09-12 13:29:38 UTC
(rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/common.py 2005-09-12 14:31:40 UTC
(rev 7898)
@@ -37,7 +37,7 @@
newWidget.connect ("key-press-event", _keyPressHandler, uiDriver,
eventHandler, lookup)
- gDebug (6, "Added key-press-event to %s" % newWidget)
+ assert gDebug (6, "Added key-press-event to %s" % newWidget)
# -----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
def _keyPressHandler (widget, event, uiDriver, eventHandler, lookup):
- gDebug (4, "Common-keypress: %s %s" % (event.type, event.keyval))
+ assert gDebug (4, "Common-keypress: %s %s" % (event.type, event.keyval))
if event.type != gtk.gdk.KEY_PRESS:
return False
@@ -60,16 +60,16 @@
isMod1 = event.state & gtk.gdk.MOD1_MASK > 0
if keycode == gtk.keysyms.ISO_Left_Tab:
- gDebug (6, "Mapping Shit-Tab to Tab")
+ assert gDebug (6, "Mapping Shit-Tab to Tab")
keycode = gtk.keysyms.Tab
# Map the Enter-Key of the numeric block to the Return-Key
if keycode == gtk.keysyms.KP_Enter:
- gDebug (6, "Mapping numeric Enter to Return")
+ assert gDebug (6, "Mapping numeric Enter to Return")
keycode = gtk.keysyms.Return
if not uiDriver._WidgetToGFObj.has_key (lookup):
- gDebug (1, "can't find widget %s" % lookup)
+ assert gDebug (1, "can't find widget %s" % lookup)
return False
gfObject = uiDriver._WidgetToGFObj [lookup]
@@ -82,12 +82,12 @@
# Add the gfObject's _form to the outgoing event
# rather than every event in the function
- gDebug (4, "Calling %s" % action.__event__)
+ assert gDebug (4, "Calling %s" % action.__event__)
action.__dict__.update ({'_form': gfObject._form})
eventHandler (action)
return True
else:
- gDebug (4, "Key dropped!")
+ assert gDebug (4, "Key dropped!")
#####################################################################
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -123,7 +123,7 @@
if lookupWidget is None:
lookupWidget = widget
- gDebug (6, "ADD FOCUSHANDLER %s (%s)" % (widget, lookupWidget))
+ assert gDebug (6, "ADD FOCUSHANDLER %s (%s)" % (widget, lookupWidget))
method = after and widget.connect_after or widget.connect
widget._focusHandler = method ('focus-in-event', self.__focusInHandler,
lookupWidget)
@@ -139,14 +139,14 @@
call to 'requestFOCUS'. If the focused widget needs a jump to another
record an additional 'requestJUMPRECORD' event will be fired.
"""
- gDebug (4, "FOCUS-IN-EVENT: %s for %s" % (widget, lookupWidget))
+ assert gDebug (4, "FOCUS-IN-EVENT: %s for %s" % (widget, lookupWidget))
gfObject = self._uiDriver._WidgetToGFObj [lookupWidget]
_formRef = gfObject._form
if _formRef._currentEntry == gfObject and \
self.widgets.index (lookupWidget) == gfObject._visibleIndex:
- gDebug (6, "SKIPPING since we already have the focus!")
+ assert gDebug (6, "SKIPPING since we already have the focus!")
return False
if _formRef._currentEntry != gfObject:
@@ -155,7 +155,7 @@
adjust = self.widgets.index (lookupWidget) - gfObject._visibleIndex
if adjust:
- gDebug (6, "Adjusting record to %s" % adjust)
+ assert gDebug (6, "Adjusting record to %s" % adjust)
action = events.Event ('requestJUMPRECORD', adjust, _form = _formRef)
self._eventHandler (action)
@@ -189,10 +189,10 @@
def showModal (self):
- gDebug (1, "showModal not implemented for gtk2 driver")
+ assert gDebug (1, "showModal not implemented for gtk2 driver")
def destroy (self):
- gDebug (1, "destroy not implemented for gtk2 driver")
+ assert gDebug (1, "destroy not implemented for gtk2 driver")
# ---------------------------------------------------------------------------
@@ -207,7 +207,7 @@
in gnue.conf.
"""
widget = self.widgets [index]
- gDebug (6, "indexedFocus: %s [%s]" % (widget, index))
+ assert gDebug (6, "indexedFocus: %s [%s]" % (widget, index))
isCombo = False
if self._useNewGTKAPI and isinstance (widget, gtk.ComboBoxEntry):
@@ -219,7 +219,7 @@
self._blockHandler (item, '_focusHandler')
- gDebug (6, "Grab focus to %s for %s" % (item, widget))
+ assert gDebug (6, "Grab focus to %s for %s" % (item, widget))
item.grab_focus ()
@@ -251,7 +251,7 @@
def loseFocus (self):
for widget in self.widgets:
- gDebug (6, "Lose focus: %s" % widget)
+ assert gDebug (6, "Lose focus: %s" % widget)
if self._useNewGTKAPI and isinstance (widget, gtk.ComboBoxEntry):
item = widget.child
@@ -275,11 +275,11 @@
the widget.
"""
widget = self.widgets [index]
- gDebug (6, "setValue %s [%s] %s" % (repr (value), index, widget))
+ assert gDebug (6, "setValue %s [%s] %s" % (repr (value), index, widget))
if not isinstance (widget, gtk.CheckButton) and \
type (value) != types.UnicodeType:
- gDebug (6, "converting %s to unicode using %s" % \
+ assert gDebug (6, "converting %s to unicode using %s" % \
(repr (value), gConfigForms ('textEncoding')))
value = unicode (value, gConfigForms ('textEncoding'))
@@ -330,7 +330,7 @@
if value in self.items:
path = "%s" % self.items.index (value)
- gDebug (6, "Changing path of treeView to %s" % path)
+ assert gDebug (6, "Changing path of treeView to %s" % path)
self._blockHandler (self.selection, '_changedHandler')
widget.set_cursor (path)
self._blockHandler (self.selection, '_changedHandler', True)
@@ -397,7 +397,7 @@
method = unblock and widget.handler_unblock or widget.handler_block
if hasattr (widget, handlerName):
handler = getattr (widget, handlerName)
- gDebug (6, "%s '%s' (%s) for %s" % \
+ assert gDebug (6, "%s '%s' (%s) for %s" % \
(['Block', 'Unblock'] [unblock], handlerName, handler, widget))
method (handler)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -261,7 +261,7 @@
else:
entry = widget
- gDebug (6, "setCursorPosition to %s in %s [%s] (%s)" % \
+ assert gDebug (6, "setCursorPosition to %s in %s [%s] (%s)" % \
(position, entry, index, widget))
if isinstance (entry, gtk.Entry):
@@ -280,7 +280,7 @@
def setSelectedArea (self, selection1, selection2, index = 0):
- gDebug (6, "Set Selected Area %s/%s in %s [%s]" % \
+ assert gDebug (6, "Set Selected Area %s/%s in %s [%s]" % \
(selection1, selection2, self, index))
widget = self.widgets [index]
@@ -310,7 +310,7 @@
def insertTextHandler (self, widget, newtext, length, pos, gfObject):
- gDebug (6, "insert gtk.Entry () '%s' at %d (%s) into %s" % \
+ assert gDebug (6, "insert gtk.Entry () '%s' at %d (%s) into %s" % \
(newtext, widget.get_position (), pos, widget))
# Before we're going to change the field's value, make sure it has the
@@ -332,7 +332,7 @@
def deleteTextHandler (self, widget, start_pos, end_pos, gfObject):
- gDebug (6, "Delete %s to %s in %s" % (start_pos, end_pos, widget))
+ assert gDebug (6, "Delete %s to %s in %s" % (start_pos, end_pos, widget))
# Before we're going to change the field's value, make sure it has the
# focus on both sides (UI and GF)
@@ -355,7 +355,7 @@
def insertBufferHandler (self, tBuffer, iterator, newtext, length, widget):
- gDebug (6, "gtk.TextBuffer insert '%s' at %s" % \
+ assert gDebug (6, "gtk.TextBuffer insert '%s' at %s" % \
(newtext, iterator.get_offset ()))
gfObject = self._uiDriver._WidgetToGFObj [widget]
@@ -375,7 +375,7 @@
def deleteBufferHandler (self, tBuffer, start, end, widget):
- gDebug (6, "gtk.TextBuffer delete %s to %s in %s" \
+ assert gDebug (6, "gtk.TextBuffer delete %s to %s in %s" \
% (start.get_offset (), end.get_offset (), widget))
gfObject = self._uiDriver._WidgetToGFObj [widget]
@@ -571,7 +571,7 @@
def _focusOnScroll (self, adjustment, treeView):
- gDebug (6, "grabing focus to %s on adjustment-change %s" % (treeView,
+ assert gDebug (6, "grabing focus to %s on adjustment-change %s" %
(treeView,
adjustment))
self._blockHandler (treeView, '_focusHandler')
treeView.grab_focus ()
@@ -601,7 +601,7 @@
cPos = widget.get_position ()
bounds = widget.get_selection_bounds ()
- gDebug (6, "Button-Release: %s (%s) %s %s" % (widget, self._gfObject.name,
+ assert gDebug (6, "Button-Release: %s (%s) %s %s" % (widget,
self._gfObject.name,
cPos, bounds))
if len (bounds):
self._request ('SELECTWITHMOUSE', position1 = bounds [0],
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
2005-09-12 13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
2005-09-12 14:31:40 UTC (rev 7898)
@@ -177,7 +177,7 @@
def createPage (self, gfObject):
- gDebug (6, "createPage %s for %s" % (self, gfObject))
+ assert gDebug (6, "createPage %s for %s" % (self, gfObject))
newWidget = gtk.Fixed ()
swin = gtk.ScrolledWindow ()
@@ -209,7 +209,7 @@
def notebookTabHandler (self, notebook, notebookpage, pageNr):
- gDebug (6, "switch-page %s %s %s" % (pageNr, self._oldpage, notebook))
+ assert gDebug (6, "switch-page %s %s %s" % (pageNr, self._oldpage,
notebook))
if self._oldpage != pageNr:
action = events.Event ('requestPAGE', pageNr, _form = self.form)
@@ -223,7 +223,7 @@
# ---------------------------------------------------------------------------
def setPage (self, page):
- gDebug (6, "SET-PAGE %s to %s" % (self, page))
+ assert gDebug (6, "SET-PAGE %s to %s" % (self, page))
swin = page.get_parent ().get_parent ()
pageNum = self.page_num (swin)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py 2005-09-12
13:29:38 UTC (rev 7897)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py 2005-09-12
14:31:40 UTC (rev 7898)
@@ -62,7 +62,7 @@
def _scrollHandler (self, adjustment, gfObject):
- gDebug (6, "Adjust to %s" % (int (adjustment.value)))
+ assert gDebug (6, "Adjust to %s" % (int (adjustment.value)))
action = events.Event ('requestRECORDNUMBER', int (adjustment.value),
_form = gfObject._form)
adjustment.stop_emission ('value-changed')
Modified: trunk/gnue-forms/src/uidrivers/wx/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/common.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-forms/src/uidrivers/wx/common.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -109,7 +109,7 @@
try:
enc=encodings[gConfigForms('textEncoding')]
except:
- gDebug (1, u_('Encoding %s is not supported by the wx UI driver') % \
+ assert gDebug (1, u_('Encoding %s is not supported by the wx UI driver') %
\
gConfigForms('textEncoding'))
enc=encodings['iso8859-1']
Modified: trunk/gnue-navigator/src/GNClient.py
===================================================================
--- trunk/gnue-navigator/src/GNClient.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-navigator/src/GNClient.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -129,8 +129,8 @@
break
except ImportError:
- gDebug (1, "Unable to load UI driver %s" % self.ui_type)
- gDebug (1, "Error: %s" % errors.getException () [2])
+ assert gDebug (1, "Unable to load UI driver %s" % self.ui_type)
+ assert gDebug (1, "Error: %s" % errors.getException () [2])
# If user specified a specific UI, don't cycle...
if SPECIFIC_UI:
Modified: trunk/gnue-navigator/src/GNObjects.py
===================================================================
--- trunk/gnue-navigator/src/GNObjects.py 2005-09-12 13:29:38 UTC (rev
7897)
+++ trunk/gnue-navigator/src/GNObjects.py 2005-09-12 14:31:40 UTC (rev
7898)
@@ -128,14 +128,14 @@
formfile = self.__resolveLocation (step, 'FormDir')
if sys.platform != 'win32':
- gDebug (1, 'Running command " %s %s"' % (formCommand, formfile))
+ assert gDebug (1, 'Running command " %s %s"' % (formCommand, formfile))
os.spawnlpe (os.P_NOWAIT, formCommand, formCommand, formfile, os.environ)
else:
command = string.split ("%s" % (formCommand))
command.append ('"%s"' % formfile)
- gDebug (1, 'Running command " %s "' % (command))
+ assert gDebug (1, 'Running command " %s "' % (command))
os.spawnve (os.P_NOWAIT, command [0], command, os.environ)
@@ -147,7 +147,7 @@
"""
"""
- gDebug (1, 'Running app "%s"' % (step.location))
+ assert gDebug (1, 'Running app "%s"' % (step.location))
command = string.split (step.location)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7898 - in trunk: gnue-appserver/src gnue-appserver/src/gld gnue-appserver/src/language gnue-common/src/apps gnue-common/src/cursing gnue-common/src/datasources gnue-common/src/datasources/drivers/Base gnue-common/src/datasources/drivers/DBSIG2 gnue-common/src/datasources/drivers/sql gnue-common/src/datasources/drivers/sql/interbase gnue-common/src/datasources/drivers/sql/msado gnue-common/src/datasources/drivers/sql/postgresql gnue-common/src/definitions gnue-common/src/formatting/masks gnue-common/src/logic gnue-common/src/rpc/drivers gnue-common/src/rpc/drivers/_helpers gnue-common/src/rpc/drivers/pyro gnue-common/src/rpc/drivers/xmlrpc gnue-common/src/utils gnue-forms/src gnue-forms/src/GFObjects gnue-forms/src/input/displayHandlers gnue-forms/src/uidrivers/_base gnue-forms/src/uidrivers/curses gnue-forms/src/uidrivers/curses/widgets gnue-forms/src/uidrivers/gtk2 gnue-forms/src/uidrivers/gtk2/widgets gnue-forms/src/uidrivers/gtk2/widgets/form gnue-forms/src/uidrivers/wx gnue-navigator/src,
jamest <=