gnue-appserver/src geasInstance.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/10/07 17:06:32

Modified files:
        src            : geasInstance.py 

Log message:
        fix: don't catch all kinds of errors

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasInstance.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gnue-appserver/src/geasInstance.py
diff -c gnue-appserver/src/geasInstance.py:1.20 
gnue-appserver/src/geasInstance.py:1.21
*** gnue-appserver/src/geasInstance.py:1.20     Tue Oct  7 12:03:53 2003
--- gnue-appserver/src/geasInstance.py  Tue Oct  7 17:06:32 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasInstance.py,v 1.20 2003/10/07 16:03:53 siesel Exp $
  
  import types
  
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasInstance.py,v 1.21 2003/10/07 21:06:32 siesel Exp $
  
  import types
  
***************
*** 52,58 ****
        try:
          # encode unicode values to utf-8 (normal case)
          return value.encode('utf-8')
!       except:
          # if not UnicodeType then return normal string
          return str(value)
      
--- 52,58 ----
        try:
          # encode unicode values to utf-8 (normal case)
          return value.encode('utf-8')
!       except AttributeError:
          # if not UnicodeType then return normal string
          return str(value)
      
***************
*** 117,123 ****
        try:
          # decode unicode values from utf-8 
          value = value.decode('utf-8')
!       except:
          # return normal string in all other cases (this will raise a warning 
by
          # the dbdriver
          value = str(value)
--- 117,123 ----
        try:
          # decode unicode values from utf-8 
          value = value.decode('utf-8')
!       except (AttributeError, UnicodeError):
          # return normal string in all other cases (this will raise a warning 
by
          # the dbdriver
          value = str(value)