[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnuef/src GFDebug.py GFEvent.py GFForm.py ...
|
From: |
Jason Cater |
|
Subject: |
gnue/gnuef/src GFDebug.py GFEvent.py GFForm.py ... |
|
Date: |
Mon, 14 May 2001 13:04:20 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 01/05/14 13:04:20
Modified files:
gnuef/src : GFDebug.py GFEvent.py GFForm.py GFObjects.py
GFTrigger.py UIbase.py UIcurses.py
UIpyncurses.py UIwxpython.py
Log message:
Changed references from GFDebug to gnue.common.GDebug
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFDebug.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFEvent.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects.py.diff?cvsroot=OldCVS&tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIcurses.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIpyncurses.py.diff?cvsroot=OldCVS&tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.85&tr2=1.86&r1=text&r2=text
Patches:
Index: gnue/gnuef/src/GFDebug.py
diff -u gnue/gnuef/src/GFDebug.py:1.3 gnue/gnuef/src/GFDebug.py:1.4
--- gnue/gnuef/src/GFDebug.py:1.3 Fri May 11 14:58:09 2001
+++ gnue/gnuef/src/GFDebug.py Mon May 14 13:04:20 2001
@@ -19,7 +19,7 @@
# Copyright 2000 Free Software Foundation
#
# FILE:
-# GFDebug.py
+# GDebug.py
#
# DESCRIPTION:
# Intelligently handles traces and exception handling for GFForms
@@ -27,7 +27,7 @@
# NOTES:
-from gnue.common import GDebug
+from gnue.common from gnue.common import GDebug
def printMesg(level, message):
GDebug.printMesg(level, message)
Index: gnue/gnuef/src/GFEvent.py
diff -u gnue/gnuef/src/GFEvent.py:1.13 gnue/gnuef/src/GFEvent.py:1.14
--- gnue/gnuef/src/GFEvent.py:1.13 Wed Apr 11 11:01:58 2001
+++ gnue/gnuef/src/GFEvent.py Mon May 14 13:04:20 2001
@@ -28,7 +28,7 @@
#
import GFOptions
-import GFDebug
+from gnue.common import GDebug
#
# Basic event passed between items
@@ -75,10 +75,10 @@
#
def processEvent(self, event):
try:
-# GFDebug.printMesg(3, "Event: %s " % (event.getEvent()))
+# GDebug.printMesg(3, "Event: %s " % (event.getEvent()))
self.incommingEvent[event.event] (event)
except KeyError:
- GFDebug.printMesg(3, "Unknown Event: %s " % (event.getEvent()))
+ GDebug.printMesg(3, "Unknown Event: %s " % (event.getEvent()))
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.92 gnue/gnuef/src/GFForm.py:1.93
--- gnue/gnuef/src/GFForm.py:1.92 Fri May 11 18:42:31 2001
+++ gnue/gnuef/src/GFForm.py Mon May 14 13:04:20 2001
@@ -30,7 +30,7 @@
import sys
import os
import string
-import GFDebug
+from gnue.common import GDebug
import GFOptions
import traceback
@@ -85,10 +85,10 @@
self.walk(self.initEntries)
self.walk(self.initLabels)
- GFDebug.printMesg(3, "Database Dictionary")
- GFDebug.printMesg(3, "%s"%self._databaseDictionary)
- GFDebug.printMesg(3, "Datasource Dictionary")
- GFDebug.printMesg(3, "%s"%self._datasourceDictionary)
+ GDebug.printMesg(3, "Database Dictionary")
+ GDebug.printMesg(3, "%s"%self._databaseDictionary)
+ GDebug.printMesg(3, "Datasource Dictionary")
+ GDebug.printMesg(3, "%s"%self._datasourceDictionary)
#Set trigger namespace, we'll need something more
#detailed than this including widgets etc. Also attaches
@@ -189,7 +189,7 @@
for block in self._blockList:
if block.name == blockname:
value = block._dataSourceLink.getField(block._currentRecord,fieldname)
- GFDebug.printMesg(2,"block %s with field %s found. Value is %s" %
(block.name, fieldname, value))
+ GDebug.printMesg(2,"block %s with field %s found. Value is %s" %
(block.name, fieldname, value))
return value
return None
@@ -223,7 +223,7 @@
block.processRollback()
for entry in block._entryList:
if hasattr(entry,'queryDefault'):
- GFDebug.printMesg(1, "%s will be set to %s" % (entry.name,
entry.queryDefault))
+ GDebug.printMesg(1, "%s will be set to %s" % (entry.name,
entry.queryDefault))
entry.setValue(entry.queryDefault)
self._currentBlock.initQuery()
return message
@@ -248,16 +248,16 @@
try:
self.processTrigger('Pre-Commit')
except TriggerError:
- GFDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
+ GDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
return "Form trigger returned error"
for block in self._blockList:
- GFDebug.printMesg(1, "Saving %s"%block.name)
+ GDebug.printMesg(1, "Saving %s"%block.name)
try:
block.processTrigger('Pre-Commit')
block.processCommit()
except TriggerError:
- GFDebug.printMesg(1, "Trigger block Pre-Commit threw a
TriggerError!")
+ GDebug.printMesg(1, "Trigger block Pre-Commit threw a
TriggerError!")
return "Block trigger returned error"
block.processTrigger('Post-Commit')
@@ -329,7 +329,7 @@
def TriggerErrorFunc(self, t):
't is an instance of TriggerError'
trigMsg = "Trigger Exception :\n" + t.msg
- GFDebug.printMesg(0, trigMsg)
+ GDebug.printMesg(0, trigMsg)
return trigMsg
#
@@ -376,8 +376,8 @@
if validValues[key] == value:
replacement = key
break
- GFDebug.printMesg(2,"(%s, %s)"%(object,value))
- GFDebug.printMesg(2,"Replacing with %s"% replacement)
+ GDebug.printMesg(2,"(%s, %s)"%(object,value))
+ GDebug.printMesg(2,"Replacing with %s"% replacement)
self._currentEntry.processTrigger('pre-change')
object.setValue(replacement)
self._currentEntry.processTrigger('post-change')
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.86 gnue/gnuef/src/GFObjects.py:1.87
--- gnue/gnuef/src/GFObjects.py:1.86 Fri May 4 16:27:03 2001
+++ gnue/gnuef/src/GFObjects.py Mon May 14 13:04:20 2001
@@ -36,7 +36,7 @@
from GFEvent import *
from GFTrigger import *
import GFOptions
-import GFDebug
+from gnue.common import GDebug
import string
import types
@@ -127,7 +127,7 @@
self._value = value
def getValue(self):
- GFDebug.printMesg(10, "Value = %s"% self._value)
+ GDebug.printMesg(10, "Value = %s"% self._value)
return self._value
#
@@ -307,7 +307,7 @@
# processCommit
#
def processCommit(self):
- GFDebug.printMesg(1, "processing commit on block %s"%self.name)
+ GDebug.printMesg(1, "processing commit on block %s"%self.name)
self.mode='commit'
# if this is a detail and the key isn't filled from master block then fill
it
@@ -315,7 +315,7 @@
masterBlock,masterField = string.split(self.master,'.')
fieldValue = self._form.findValue(masterBlock, masterField)
- GFDebug.printMesg(2, "Master field value is :%s:"%fieldValue)
+ GDebug.printMesg(2, "Master field value is :%s:"%fieldValue)
if len(fieldValue) > 0:
for count in range(self._recordCount+1):
self._dataSourceLink.setField(count,self.detail,fieldValue, TRUE)
@@ -408,8 +408,8 @@
def initialize(self):
if not hasattr(self,'field'):
- GFDebug.printMesg(1,"%s" % self.getObjectType())
- GFDebug.printMesg(1,"%s" % self.__dict__)
+ GDebug.printMesg(1,"%s" % self.getObjectType())
+ GDebug.printMesg(1,"%s" % self.__dict__)
self.field = self.name
self._block._dataSourceLink.addField(self.field)
@@ -433,7 +433,7 @@
if self._value=='':
if hasattr(self, 'style') and self.style=='checkbox':
self._value = 0
- GFDebug.printMesg(10, "Value = %s"% self._value)
+ GDebug.printMesg(10, "Value = %s"% self._value)
return self._value
@@ -450,7 +450,7 @@
# switchRecord
#
def switchRecord(self, newRecord):
- GFDebug.printMesg(2, "Switching to record %s" % (newRecord))
+ GDebug.printMesg(2, "Switching to record %s" % (newRecord))
self._value = self._block._dataSourceLink.getField(newRecord,self.field)
self._cursorPosition = len(self._value)
@@ -531,7 +531,7 @@
#self.emptyRecord = {}
if hasattr(self,'database'):
- GFDebug.printMesg(1, " linking to database %s" % (self.database))
+ GDebug.printMesg(1, " linking to database %s" % (self.database))
self.dataConnection = self._form._databaseDictionary[self.database]
self.fieldList = self.dataConnection.getFieldList(self.table).keys()
@@ -599,7 +599,7 @@
# against the database backend
#
def query(self):
- GFDebug.printMesg(2, "Query with this in resultSet\n%s"%self.resultSet[0])
+ GDebug.printMesg(2, "Query with this in resultSet\n%s"%self.resultSet[0])
if hasattr(self,'database'):
if self.sql == None:
mask = {}
@@ -642,14 +642,14 @@
def commit(self):
if hasattr(self,'database'):
for count in range(len(self.resultSet)):
- GFDebug.printMesg(2, "record %s is %s \n %s" % (count,
self.resultSetStatus[count],self.resultSet[count]))
+ GDebug.printMesg(2, "record %s is %s \n %s" % (count,
self.resultSetStatus[count],self.resultSet[count]))
mask = {}
for key in self.resultSet[count].keys():
if key in self.dataConnection.getFieldList(self.table).keys() or \
key == self.uniqueKey:
mask[key]=self.resultSet[count][key]
- GFDebug.printMesg(10, "will be passing\n%s"% mask)
+ GDebug.printMesg(10, "will be passing\n%s"% mask)
if self.resultSetStatus[count] in ('modified', 'deleted'):
if self.resultSet[count].has_key(self.uniqueKey):
@@ -658,10 +658,10 @@
# self.resultSet[count][self.uniqueKey] = -1
# elif self.resultSet[count][self.uniqueKey] > 0:
- GFDebug.printMesg(1, "updating the record")
+ GDebug.printMesg(1, "updating the record")
self.dataConnection.update(self.table,mask)
else:
- GFDebug.printMesg(1,"deleting the record")
+ GDebug.printMesg(1,"deleting the record")
#mask[self.uniqueKey] = \
# mask[self.uniqueKey] * -1
self.dataConnection.delete(self.table,mask)
@@ -669,7 +669,7 @@
#mask[self.uniqueKey] = -1
else:
- GFDebug.printMesg(1, "Inserting the record")
+ GDebug.printMesg(1, "Inserting the record")
result = self.dataConnection.insert(self.table,mask)
for newkey in result.keys():
@@ -720,7 +720,7 @@
# int(self.resultSet[recordNumber][self.uniqueKey]) * -1
#self.resultSetStatus[recordNumber] = 'deleted'
- #GFDebug.printMesg(1, "removing object: %s" %
(self.resultSet[recordNumber][self.uniqueKey]))
+ #GDebug.printMesg(1, "removing object: %s" %
(self.resultSet[recordNumber][self.uniqueKey]))
def getField(self,recordNumber,fieldName):
try:
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.21 gnue/gnuef/src/GFTrigger.py:1.22
--- gnue/gnuef/src/GFTrigger.py:1.21 Fri Apr 20 18:22:51 2001
+++ gnue/gnuef/src/GFTrigger.py Mon May 14 13:04:20 2001
@@ -74,7 +74,7 @@
for function in self._trigger[key]:
function(self)
else:
- GFDebug.printMesg(10, "No triggers to fire")
+ GDebug.printMesg(10, "No triggers to fire")
else:
print "Invalid trigger ",key
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.35 gnue/gnuef/src/UIbase.py:1.36
--- gnue/gnuef/src/UIbase.py:1.35 Fri May 4 16:27:03 2001
+++ gnue/gnuef/src/UIbase.py Mon May 14 13:04:20 2001
@@ -131,7 +131,7 @@
try:
uiWidget =
self.widgetConstructorFunction[self._currentObject[0].getObjectType()] ()
widget = uiWidget.widgets
- GFDebug.printMesg(2, "Widget is %s" % widget)
+ GDebug.printMesg(2, "Widget is %s" % widget)
self._formToUIWidget[self._currentObject[0]]=uiWidget
@@ -374,7 +374,7 @@
self.widgets.append(newWidget)
def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight, interface, spacer):
- GFDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
+ GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
Index: gnue/gnuef/src/UIcurses.py
diff -u gnue/gnuef/src/UIcurses.py:1.7 gnue/gnuef/src/UIcurses.py:1.8
--- gnue/gnuef/src/UIcurses.py:1.7 Fri Apr 20 18:22:52 2001
+++ gnue/gnuef/src/UIcurses.py Mon May 14 13:04:20 2001
@@ -28,7 +28,7 @@
#
from GFForm import *
from UIbase import *
-import GFDebug
+from gnue.common import GDebug
import sys
import curses
@@ -144,7 +144,7 @@
action = GFEvent('requestKEYPRESS',chr(event))
self.dispatchEvent(action)
else:
- GFDebug.printMesg(3, "Dude! Unsupported Event! %s"% event)
+ GDebug.printMesg(3, "Dude! Unsupported Event! %s"% event)
#
#
@@ -221,9 +221,9 @@
object = self._currentObject[0]
container = self.currentWidget[0]
- GFDebug.printMesg( 1, "Label container = %s"%container )
+ GDebug.printMesg( 1, "Label container = %s"%container )
label = NCLabel( container, int(object.y), int(object.x), object.text)
- GFDebug.printMesg( 1, "Don't forget to add page handling")
+ GDebug.printMesg( 1, "Don't forget to add page handling")
self.newPage=0
return label
@@ -368,7 +368,7 @@
curses.doupdate()
def updateStatus(self, event):
- GFDebug.printMesg(1, "%s"%event.data)
+ GDebug.printMesg(1, "%s"%event.data)
tip, recordStatus, insertMode, currentRecord, maxRecord, currentPage,
maxPage =event.data
if tip != None:
@@ -514,9 +514,9 @@
#
class UILabel(UIWidget, UIHelper):
def createWidget(self, object, container, textWidth, textHeight,
widgetWidth, widgetHeight,interface,spacer):
- GFDebug.printMesg( 1, "Label container = %s"%container )
+ GDebug.printMesg( 1, "Label container = %s"%container )
label = NCLabel( container, int(object.y), int(object.x), object.text)
- GFDebug.printMesg( 1, "Don't forget to add page handling")
+ GDebug.printMesg( 1, "Don't forget to add page handling")
interface.newPage=0
return label
Index: gnue/gnuef/src/UIpyncurses.py
diff -u gnue/gnuef/src/UIpyncurses.py:1.17 gnue/gnuef/src/UIpyncurses.py:1.18
--- gnue/gnuef/src/UIpyncurses.py:1.17 Fri Apr 20 18:22:52 2001
+++ gnue/gnuef/src/UIpyncurses.py Mon May 14 13:04:20 2001
@@ -29,7 +29,7 @@
from GFForm import *
from UIbase import *
-import GFDebug
+from gnue.common import GDebug
import sys
import ncurses._form
@@ -83,7 +83,7 @@
sys.exitclean=TRUE
def addField(self,x,y,w,text,new_page, object, type="entry"):
- GFDebug.printMesg(3,'%d %d %d %s\r' % (x,y,w,text))
+ GDebug.printMesg(3,'%d %d %d %s\r' % (x,y,w,text))
if x+w>79 or y>24:
return
field=ncurses._form.FIELD(1,w,y,x)
@@ -96,7 +96,7 @@
return field
def addChoice(self,x,y,w,choices,new_page, object, type="choice"):
- GFDebug.printMesg(3,'%d %d %d %s\r' % (x,y,w,choices[0]))
+ GDebug.printMesg(3,'%d %d %d %s\r' % (x,y,w,choices[0]))
if x+w>79 or y>24:
return
field=ncurses._form.FIELD(1,w,y,x)
@@ -109,7 +109,7 @@
return field
def addLabel(self,x,y,text,new_page):
- GFDebug.printMesg(3, '%d %d %s\r' % (x,y,text))
+ GDebug.printMesg(3, '%d %d %s\r' % (x,y,text))
if x+len(text)>79 or y>24:
return
field=ncurses._form.LABEL(y,x,text)
@@ -214,7 +214,7 @@
self.dispatchEvent( action )
else:
try:
- GFDebug.printMesg(2, "%d"%event)
+ GDebug.printMesg(2, "%d"%event)
action = self.keyEvents[event]
self.dispatchEvent(action)
except KeyError:
@@ -222,7 +222,7 @@
action = GFEvent('requestKEYPRESS',chr(event))
self.dispatchEvent(action)
else:
- GFDebug.printMesg(3, "Dude! Unsupported Event! %s"% event)
+ GDebug.printMesg(3, "Dude! Unsupported Event! %s"% event)
#
# Handlers used by buildUI to add widgets to the UI
@@ -383,7 +383,7 @@
count = count +1
def updateStatus(self, event):
- GFDebug.printMesg(1, "%s"%event.data)
+ GDebug.printMesg(1, "%s"%event.data)
tip, recordStatus, insertMode, currentRecord, maxRecord, currentPage,
maxPage =event.data
if tip != None:
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.85 gnue/gnuef/src/UIwxpython.py:1.86
--- gnue/gnuef/src/UIwxpython.py:1.85 Fri May 4 16:27:03 2001
+++ gnue/gnuef/src/UIwxpython.py Mon May 14 13:04:20 2001
@@ -36,7 +36,7 @@
import sys
import string
-import GFDebug
+from gnue.common import GDebug
import GFOptions
#
@@ -418,7 +418,7 @@
action = self.keyEvents[event.KeyCode()]
except KeyError:
if event.ControlDown():
- GFDebug.printMesg(2, "Control %s" % (chr(event.KeyCode())))
+ GDebug.printMesg(2, "Control %s" % (chr(event.KeyCode())))
action = GFEvent('requestHOTKEY',chr(event.KeyCode()))
elif (32 <= event.KeyCode() <= 126) or (event.KeyCode() ==
WXK_RETURN):
action = GFEvent('requestKEYPRESS',chr(event.KeyCode()))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/gnuef/src GFDebug.py GFEvent.py GFForm.py ...,
Jason Cater <=