gnue gnue-common/src/FormatMasks/DateMask.py gn...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/10/10 21:45:55

Modified files:
        gnue-common/src/FormatMasks: DateMask.py 
        gnuef/src      : GFParser.py 

Log message:
        fixed typo in parser description

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/FormatMasks/DateMask.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.57&tr2=1.58&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/FormatMasks/DateMask.py
diff -u gnue/gnue-common/src/FormatMasks/DateMask.py:1.5 
gnue/gnue-common/src/FormatMasks/DateMask.py:1.6
--- gnue/gnue-common/src/FormatMasks/DateMask.py:1.5    Wed Oct 10 19:24:50 2001
+++ gnue/gnue-common/src/FormatMasks/DateMask.py        Wed Oct 10 21:45:55 2001
@@ -80,7 +80,7 @@
     return value == self.literal or value in predefinedDateLiterals
 
 class DateMask (BaseMask):
-  def __init__(self, outputMask, inputMask=None, outputMask2=None): 
+  def __init__(self, outputMask, inputMask=None, outputMask2=None):
 
     self.predefinedLiterals = predefinedDateLiterals
 
@@ -90,22 +90,22 @@
     # TODO: Make DateMask's defaultmask be based on locale settings
     self.defaultmask = "m/d/y"
 
-    self.maskMappings = { 
-      'a': _aSection,       'A': _ASection, 
-      'b': _bSection,       'B': _BSection, 
-      'c': _cSection,       'd': _dSection, 
-      'D': _DSection,       'h': _hSection, 
-      'H': _HSection, 
-      'g': _gSection,       'G': _GSection, 
-      'j': _jSection,       'J': _JSection, 
-      'm': _mSection,       'M': _mSection, 
-      'i': _iSection,       'I': _ISection, 
-      'p': _pSection,       'P': _PSection, 
-      's': _sSection,       'S': _SSection, 
-      'u': _uSection,       'U': _USection, 
-      'v': _vSection,       'V': _VSection, 
-      'w': _wSection, 
-      'x': _xSection,       'X': _XSection, 
+    self.maskMappings = {
+      'a': _aSection,       'A': _ASection,
+      'b': _bSection,       'B': _BSection,
+      'c': _cSection,       'd': _dSection,
+      'D': _DSection,
+      'h': _hSection,       'H': _HSection,
+      'g': _gSection,       'G': _GSection,
+      'j': _jSection,       'J': _JSection,
+      'm': _mSection,       'M': _mSection,
+      'i': _iSection,       'I': _ISection,
+      'p': _pSection,       'P': _PSection,
+      's': _sSection,       'S': _SSection,
+      'u': _uSection,       'U': _USection,
+      'v': _vSection,       'V': _VSection,
+      'w': _wSection,
+      'x': _xSection,       'X': _XSection,
       'y': _ySection,       'Y': _YSection }
 
     BaseMask.__init__(self, outputMask, inputMask, outputMask2)
@@ -114,19 +114,19 @@
     self.entry = ""
     self.inputMaskPos = []
     self.inputMaskLen = []
-    for i in range(len(self.inputHandlers)): 
+    for i in range(len(self.inputHandlers)):
       self.inputMaskPos.append(0)
       self.inputMaskLen.append(0)
 
 
-  def processEdit (self, value, str, pos=0, replaces=0): 
+  def processEdit (self, value, str, pos=0, replaces=0):
     nv = value
-    if pos == len(nv): 
+    if pos == len(nv):
       nv += str
-    else: 
+    else:
       nv = "%s%s%s" % (nv[:pos],str,nv[pos+replaces:])
 
-    section = 0 
+    section = 0
     while section < len(self.inputMaskPos) and \
           self.inputMaskPos[section] < pos:
       section += 1
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.57 gnue/gnuef/src/GFParser.py:1.58
--- gnue/gnuef/src/GFParser.py:1.57     Wed Oct 10 19:24:50 2001
+++ gnue/gnuef/src/GFParser.py  Wed Oct 10 21:45:55 2001
@@ -144,11 +144,6 @@
          'Deprecated': 'Use the external connections file format.',
          'ParentTags': ('form',) },
 
-      'datasource': { 
-         'BaseClass': GFObjects.GFDataSource,  
-         'Attributes': GDataSource.tagAttributes, 
-         'ParentTags': ('form',) },
-
       'page': {
          'BaseClass': GFObjects.GFPage,
          'Required': 1,
@@ -299,7 +294,7 @@
             'foreign_key_description': {
                'Typecast': GTypecast.text }, 
             'sloppyQuery': {
-               'Typecast': GTypecast.text }, 
+               'Typecast': GTypecast.text },
             'ignoreCaseOnQuery': {
                'Typecast': GTypecast.boolean, 
                'Default': 0 }, 
@@ -505,7 +500,7 @@
 
       'description':{ 
          'BaseClass': GFObjects.GFOption,
-         'Attributes': { 
+         'Attributes': {
             'name': {
                'Typecast': GTypecast.name, 
                'ValueSet': {
@@ -581,8 +576,6 @@
       p['Required'] = 0
 
       xmlElements[name] = p
-
-  print xmlElements
 
   return xmlElements