[Python-checkins] CVS: python/dist/src/Lib/lib-old ni.py,1.3,1.4

[Eric S. Raymond]

Update of /cvsroot/python/python/dist/src/Lib/lib-old
In directory usw-pr-cvs1:/tmp/cvs-serv16150

Modified Files:
	ni.py 
Log Message:
String method conversion.


Index: ni.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-old/ni.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ni.py	2000/07/16 12:04:31	1.3
--- ni.py	2001/02/09 11:32:00	1.4
***************
*** 164,168 ****
  
  import imp
- import string
  import sys
  import __builtin__
--- 164,167 ----
***************
*** 207,211 ****
          file, filename, (suff, mode, type) = stuff
          # Hack around restriction in imp.load_dynamic()
!         i = string.rfind(name, '.')
          tail = name[i+1:]
          if sys.modules.has_key(tail):
--- 206,210 ----
          file, filename, (suff, mode, type) = stuff
          # Hack around restriction in imp.load_dynamic()
!         i = name.rfind('.')
          tail = name[i+1:]
          if sys.modules.has_key(tail):
***************
*** 242,246 ****
          name = m.__name__
          if '.' in name:
!             name = name[:string.rfind(name, '.')]
          else:
              name = ''
--- 241,245 ----
          name = m.__name__
          if '.' in name:
!             name = name[:name.rfind('.')]
          else:
              name = ''
***************
*** 251,255 ****
          package.__domain__ = domain = [name]
          while '.' in name:
!             name = name[:string.rfind(name, '.')]
              domain.append(name)
          if name:
--- 250,254 ----
          package.__domain__ = domain = [name]
          while '.' in name:
!             name = name[:name.rfind('.')]
              domain.append(name)
          if name:
***************
*** 286,290 ****
                  return self.finish(package, p, '', fromlist)
              if '.' in name:
!                 i = string.find(name, '.')
                  name, tail = name[:i], name[i:]
              else:
--- 285,289 ----
                  return self.finish(package, p, '', fromlist)
              if '.' in name:
!                 i = name.find('.')
                  name, tail = name[:i], name[i:]
              else:
***************
*** 294,298 ****
              return self.finish(package, m, tail, fromlist)
          if '.' in name:
!             i = string.find(name, '.')
              name, tail = name[:i], name[i:]
          else:
--- 293,297 ----
              return self.finish(package, m, tail, fromlist)
          if '.' in name:
!             i = name.find('.')
              name, tail = name[:i], name[i:]
          else:
***************
*** 313,317 ****
              m = self.get1(yname)
          while tail:
!             i = string.find(tail, '.', 1)
              if i > 0:
                  head, tail = tail[:i], tail[i:]
--- 312,316 ----
              m = self.get1(yname)
          while tail:
!             i = tail.find('.', 1)
              if i > 0:
                  head, tail = tail[:i], tail[i:]
***************
*** 352,356 ****
              return sys.modules[name]
          if '.' in name:
!             i = string.rfind(name, '.')
              head, tail = name[:i], name[i+1:]
          else:
--- 351,355 ----
              return sys.modules[name]
          if '.' in name:
!             i = name.rfind('.')
              head, tail = name[:i], name[i+1:]
          else:
***************
*** 368,372 ****
          name = module.__name__
          if '.' in name:
!             i = string.rfind(name, '.')
              head, tail = name[:i], name[i+1:]
              path = sys.modules[head].__path__
--- 367,371 ----
          name = module.__name__
          if '.' in name:
!             i = name.rfind('.')
              head, tail = name[:i], name[i+1:]
              path = sys.modules[head].__path__