[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-common/src/logic NamespaceCore.py GTrigger.py
From: |
Jan Ischebeck |
Subject: |
gnue-common/src/logic NamespaceCore.py GTrigger.py |
Date: |
Fri, 19 Sep 2003 19:44:45 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-common
Branch:
Changes by: Jan Ischebeck <address@hidden> 03/09/19 19:44:45
Modified files:
src/logic : NamespaceCore.py GTrigger.py
Log message:
allow use of "int(form.Myblock.myfield)" in trigger
fix broken trigger error handling in case of missing type attribute
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/logic/NamespaceCore.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/logic/GTrigger.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
Patches:
Index: gnue-common/src/logic/GTrigger.py
diff -c gnue-common/src/logic/GTrigger.py:1.37
gnue-common/src/logic/GTrigger.py:1.38
*** gnue-common/src/logic/GTrigger.py:1.37 Thu Jul 31 11:14:19 2003
--- gnue-common/src/logic/GTrigger.py Fri Sep 19 19:44:44 2003
***************
*** 373,386 ****
def _handleTriggerException(self, err):
if hasattr(self, 'name'):
name = self.name
else:
! name = self.type
if isinstance(err, SyntaxError):
msg = _('There is an error in one of this document\'s
triggers.\n\nTraceback:\n') + \
! ' Trigger "%s" (%s), line %s' % (name, self.type, err.lineno - 1)
+ "\n" + \
' ' + err.text[:-1] + "\n" + \
' ' + (' ' * (err.offset-1)) + '^\n' + \
'SyntaxError: ' + err.msg
--- 373,391 ----
def _handleTriggerException(self, err):
+ if hasattr(self, 'type'):
+ triggertype = self.type
+ else:
+ triggertype = 'unknown'
+
if hasattr(self, 'name'):
name = self.name
else:
! name = triggertype
if isinstance(err, SyntaxError):
msg = _('There is an error in one of this document\'s
triggers.\n\nTraceback:\n') + \
! ' Trigger "%s" (%s), line %s' % (name, triggertype, err.lineno -
1) + "\n" + \
' ' + err.text[:-1] + "\n" + \
' ' + (' ' * (err.offset-1)) + '^\n' + \
'SyntaxError: ' + err.msg
***************
*** 392,398 ****
except:
txt = ""
msg = _('There is an error in one of this document\'s
triggers.\n\nTraceback:\n') + \
! ' Trigger "%s" (%s), line %s' % (name, self.type,
int(tb.tb_lineno) - 1) + "\n" + \
' %s\n' % (ec) + \
'%s: %s' % (tp, txt)
raise
--- 397,403 ----
except:
txt = ""
msg = _('There is an error in one of this document\'s
triggers.\n\nTraceback:\n') + \
! ' Trigger "%s" (%s), line %s' % (name, triggertype,
int(tb.tb_lineno) - 1) + "\n" + \
' %s\n' % (ec) + \
'%s: %s' % (tp, txt)
raise
Index: gnue-common/src/logic/NamespaceCore.py
diff -c gnue-common/src/logic/NamespaceCore.py:1.2
gnue-common/src/logic/NamespaceCore.py:1.3
*** gnue-common/src/logic/NamespaceCore.py:1.2 Mon Feb 17 02:32:50 2003
--- gnue-common/src/logic/NamespaceCore.py Fri Sep 19 19:44:44 2003
***************
*** 217,222 ****
--- 217,240 ----
return ""
#
+ # __str__
+ #
+ # This executes at a different level than the __setattr__
+ # While __setattr__ is executed in the parent object to protect
+ # it's namespace object links, this routine is called by the
+ # object referenced
+ #
+ # Example: foo = int(form.block1.entry1)
+ #
+ # This __int__ would execute against the entry1 object
+ #
+ def __int__(self):
+ if self._triggerGet:
+ return int(self._triggerGet())
+ else:
+ return 0
+
+ #
# __cmp__
#
# Forces the system to compare the string values of
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-common/src/logic NamespaceCore.py GTrigger.py,
Jan Ischebeck <=