[Luma-commit] luma/lib/luma/plugins/addressbook AddressbookWidget.py,1.21,1.22

[Wido D. <wi...@us...>]

Update of /cvsroot/luma/luma/lib/luma/plugins/addressbook
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10332/lib/luma/plugins/addressbook

Modified Files:
	AddressbookWidget.py 
Log Message:
Removed depreciated string functions.

Index: AddressbookWidget.py
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/plugins/addressbook/AddressbookWidget.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AddressbookWidget.py	5 Oct 2005 15:12:18 -0000	1.21
--- AddressbookWidget.py	24 Oct 2005 18:48:25 -0000	1.22
***************
*** 12,19 ****
  from qt import *
  import os.path
- from string import strip
  import ldap
  import copy
- import string
  
  import environment
--- 12,17 ----
***************
*** 239,243 ****
          # find the given name
          if self.dataObject.hasAttribute('givenName'):
!             givenName = strip(self.dataObject.getAttributeValue('givenName', 0))
          
          # find the suffix
--- 237,241 ----
          # find the given name
          if self.dataObject.hasAttribute('givenName'):
!             givenName = self.dataObject.getAttributeValue('givenName', 0).strip()
          
          # find the suffix
***************
*** 287,291 ****
          
          if (dialog.result() == QDialog.Accepted):
!             tmpSn = strip(unicode(dialog.lastEdit.text()))
              
              if tmpSn == '':
--- 285,289 ----
          
          if (dialog.result() == QDialog.Accepted):
!             tmpSn = unicode(dialog.lastEdit.text()).strip()
              
              if tmpSn == '':
***************
*** 305,311 ****
              
              for x in self.allowedAttributes:
!                 if "givenname" == string.lower(x):
                      givenName = unicode(dialog.firstEdit.text())
!                     givenName = strip(givenName)
                      if '' == givenName:
                          self.dataObject.deleteAttribute('givenName')
--- 303,309 ----
              
              for x in self.allowedAttributes:
!                 if "givenname" == x.lower():
                      givenName = unicode(dialog.firstEdit.text())
!                     givenName = givenName.strip()
                      if '' == givenName:
                          self.dataObject.deleteAttribute('givenName')
***************
*** 323,327 ****
  
      def __normalizeQtString(self, tmpString):
!         tmpString = strip(unicode(tmpString))
          
          if (len(tmpString) > 0):
--- 321,325 ----
  
      def __normalizeQtString(self, tmpString):
!         tmpString = unicode(tmpString).strip()
          
          if (len(tmpString) > 0):
***************
*** 349,353 ****
          
          if (dialog.result() == QDialog.Accepted):
!             mail = strip(unicode(dialog.mailEdit.text()))
              
              if not(mail == ''):
--- 347,351 ----
          
          if (dialog.result() == QDialog.Accepted):
!             mail = unicode(dialog.mailEdit.text()).strip()
              
              if not(mail == ''):
***************
*** 368,372 ****
      def editCategories(self):
          dialog = CategoryEditDialog()
!         tmpString = strip(unicode(self.categoryEdit.text()))
          if not(tmpString == ''):
              dialog.setCategories(tmpString.split(','))
--- 366,370 ----
      def editCategories(self):
          dialog = CategoryEditDialog()
!         tmpString = unicode(self.categoryEdit.text()).strip()
          if not(tmpString == ''):
              dialog.setCategories(tmpString.split(','))