[pyrepl-checkins] pyrepl/pyrepl python_reader.py,1.2,1.3 module_lister.py,1.2,1.3

[mwh@codespeak.net]

Update of /cvs/pyrepl/pyrepl/pyrepl
In directory thoth.codespeak.net:/tmp/cvs-serv2290

Modified Files:
	python_reader.py module_lister.py 
Log Message:
Make module list *after* '.' gets added to sys.path.

Update keyspec syntax. 


Index: python_reader.py
===================================================================
RCS file: /cvs/pyrepl/pyrepl/pyrepl/python_reader.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** python_reader.py	17 Jan 2003 13:25:54 -0000	1.2
--- python_reader.py	17 Jan 2003 13:34:16 -0000	1.3
***************
*** 82,87 ****
  
  python_keymap = cr.completing_keymap + (
!     ('\\n', 'maybe-accept'),
!     ('\\M-\\n', 'self-insert'))
  
  class PythonicReader(CR):
--- 82,87 ----
  
  python_keymap = cr.completing_keymap + (
!     (r'\n', 'maybe-accept'),
!     (r'\M-\n', 'self-insert'))
  
  class PythonicReader(CR):
***************
*** 136,140 ****
              except KeyError:
                  try:
!                     mod = __import__(mod, self.locals, self.locals, [1])
                      return [x for x in dir(mod) if x.startswith(name)]
                  except ImportError:
--- 136,140 ----
              except KeyError:
                  try:
!                     mod = __import__(mod, self.locals, self.locals, [''])
                      return [x for x in dir(mod) if x.startswith(name)]
                  except ImportError:
***************
*** 314,317 ****
--- 314,319 ----
          print 'Type "copyright", "credits" or "license" for more information.'
          sys.path.insert(0, os.getcwd())
+ 
+         module_lister._make_module_list()
  
          mainmod = new.module('__main__')

Index: module_lister.py
===================================================================
RCS file: /cvs/pyrepl/pyrepl/pyrepl/module_lister.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** module_lister.py	17 Jan 2003 13:25:54 -0000	1.2
--- module_lister.py	17 Jan 2003 13:34:16 -0000	1.3
***************
*** 60,66 ****
      _packages[''].sort()
  
- if len(_packages) == 0:
-     _make_module_list()
- 
  def find_modules(stem):
      l = stem.split('.')
--- 60,63 ----