gnue/forms/src GFDisplayHandler.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         forms-input-mask
Changes by:     Jason Cater <address@hidden>    02/09/10 11:28:32

Modified files:
        forms/src      : GFDisplayHandler.py 

Log message:
        quick fixes so I can merge back with head

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?only_with_tag=forms-input-mask&tr1=1.30.2.2&tr2=1.30.2.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.31 
gnue/forms/src/GFDisplayHandler.py:1.32
*** gnue/forms/src/GFDisplayHandler.py:1.31     Sat Aug 24 21:05:26 2002
--- gnue/forms/src/GFDisplayHandler.py  Mon Aug 26 13:54:02 2002
***************
*** 35,48 ****
  try:
    from mx.DateTime import DateTime
  except ImportError:
!   raise """
     This GNUe tool requires mxDateTime to be installed
  
!    You can find the mxDateTime at
  
     http://www.lemburg.com/files/python/mxDateTime.html
  
  """
  
  #############################################################################
  #
--- 35,50 ----
  try:
    from mx.DateTime import DateTime
  except ImportError:
!   print """
     This GNUe tool requires mxDateTime to be installed
  
!    You can find the mxDateTime at 
  
     http://www.lemburg.com/files/python/mxDateTime.html
  
  """
+   import sys
+   sys.exit()
  
  #############################################################################
  #
***************
*** 492,498 ****
  class NumberDisplayHandler(FieldDisplayHandler):
    def __init__(self, entry, eventHandler, displayMask, inputMask):
  ##    FieldDisplayHandler.__init__(self, entry, eventHandler,
! ##            DateMask.DateMask(displayMask, inputMask))
      FieldDisplayHandler.__init__(self, entry, eventHandler, None)
  
  
--- 494,500 ----
  class NumberDisplayHandler(FieldDisplayHandler):
    def __init__(self, entry, eventHandler, displayMask, inputMask):
  ##    FieldDisplayHandler.__init__(self, entry, eventHandler,
! ##            DateMask.DateMask(displayMask, inputMask, displayMask))
      FieldDisplayHandler.__init__(self, entry, eventHandler, None)
  
  
***************
*** 570,581 ****
  #
  class DateDisplayHandler(FieldDisplayHandler):
    def __init__(self, entry, eventHandler, displayMask, inputMask):
!   
!     if not self.displayMask:
! 
!     FieldDisplayHandler.__init__(self, entry, eventHandler,
!             DateMask.DateMask(displayMask, inputMask))
! ##    FieldDisplayHandler.__init__(self, entry, eventHandler, None)
  
  
    def setValue(self, value):
--- 572,580 ----
  #
  class DateDisplayHandler(FieldDisplayHandler):
    def __init__(self, entry, eventHandler, displayMask, inputMask):
! ##    FieldDisplayHandler.__init__(self, entry, eventHandler,
! ##            DateMask.DateMask(displayMask, inputMask, displayMask))
!     FieldDisplayHandler.__init__(self, entry, eventHandler, None)
  
  
    def setValue(self, value):
***************
*** 585,595 ****
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
      if editing:
!       self.formatter.getFormattedInput(value)
! ##      format = "%m/%d/%Y"
      else:
!       self.formatter.getFormattedOutput(value)
! ##      format = "%m/%d/%y"
  
      if value in (None,""):
        return ""
--- 584,592 ----
    # TODO: Replace with format mask
    def _buildDisplayHelper(self, value, editing):
      if editing:
!       format = "%m/%d/%Y"
      else:
!       format = "%m/%d/%y"
  
      if value in (None,""):
        return ""