gnue/common/src/FormatMasks BaseMask.py NumberM...

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      03/01/18 07:06:14

Modified files:
        common/src/FormatMasks: BaseMask.py NumberMask.py TextMask.py 

Log message:
        Changed raise error, _(msg) to tmsg = _(msg); raise error, tmsg

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/BaseMask.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/NumberMask.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/TextMask.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/common/src/FormatMasks/BaseMask.py
diff -c gnue/common/src/FormatMasks/BaseMask.py:1.19 
gnue/common/src/FormatMasks/BaseMask.py:1.20
*** gnue/common/src/FormatMasks/BaseMask.py:1.19        Wed Jan  1 19:45:41 2003
--- gnue/common/src/FormatMasks/BaseMask.py     Sat Jan 18 07:06:13 2003
***************
*** 139,147 ****
            except KeyError:
              pass
        if not len(mask): 
!          raise PredefinedMaskNotFound, \
!                 _('The requested format mask "%s" is not defined for %s 
fields') \
!                     % (mask[1:], self.basetype)
  
      # Process each character in mask at a time
      isLiteral = 0
--- 139,147 ----
            except KeyError:
              pass
        if not len(mask): 
!         tmsg =  _('The requested format mask "%s" is not defined for %s 
fields') \
!                     % (mask[1:], self.basetype)  
!         raise PredefinedMaskNotFound, tmsg
  
      # Process each character in mask at a time
      isLiteral = 0
***************
*** 154,161 ****
        elif self.maskMappings.has_key(ch):
          maskHandler.append(self.maskMappings[ch])
        else:
!         raise InvalidCharInMask, _('Unexpected character "%s" in %s mask.') \
!             % (ch, self.basetype)
  
      return maskHandler
  
--- 154,162 ----
        elif self.maskMappings.has_key(ch):
          maskHandler.append(self.maskMappings[ch])
        else:
!         tmsg = _('Unexpected character "%s" in %s mask.') \
!             % (ch, self.basetype)  
!         raise InvalidCharInMask, tmsg
  
      return maskHandler
  
Index: gnue/common/src/FormatMasks/NumberMask.py
diff -c gnue/common/src/FormatMasks/NumberMask.py:1.4 
gnue/common/src/FormatMasks/NumberMask.py:1.5
*** gnue/common/src/FormatMasks/NumberMask.py:1.4       Wed Jan  1 19:45:41 2003
--- gnue/common/src/FormatMasks/NumberMask.py   Sat Jan 18 07:06:13 2003
***************
*** 201,207 ****
              value[ self.inputMaskPos[i]: \
                     self.inputMaskPos[i] + self.inputMaskLen[i]], date )
        elif mustValidate: 
!         raise InvalidEntry, _("Invalid Entry")
  
      return date
      
--- 201,208 ----
              value[ self.inputMaskPos[i]: \
                     self.inputMaskPos[i] + self.inputMaskLen[i]], date )
        elif mustValidate: 
!         tmsg = _("Invalid Entry") 
!         raise InvalidEntry, tmsg
  
      return date
      
Index: gnue/common/src/FormatMasks/TextMask.py
diff -c gnue/common/src/FormatMasks/TextMask.py:1.5 
gnue/common/src/FormatMasks/TextMask.py:1.6
*** gnue/common/src/FormatMasks/TextMask.py:1.5 Wed Jan  1 19:45:41 2003
--- gnue/common/src/FormatMasks/TextMask.py     Sat Jan 18 07:06:13 2003
***************
*** 190,196 ****
              value[ self.inputMaskPos[i]: \
                     self.inputMaskPos[i] + self.inputMaskLen[i]], date )
        elif mustValidate: 
!         raise InvalidEntry, _("Invalid Entry")
  
      return date
      
--- 190,197 ----
              value[ self.inputMaskPos[i]: \
                     self.inputMaskPos[i] + self.inputMaskLen[i]], date )
        elif mustValidate: 
!         tmsg = _("Invalid Entry")  
!         raise InvalidEntry, tmsg
  
      return date