[pyrepl-checkins] pyrepl/pyrepl python_reader.py,1.9,1.10

[mwh@codespeak.net]

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

Modified Files:
	python_reader.py 
Log Message:
Remove some 2.1 compatibility hacks (I think 2.1 support died at some
point earlier on today).


Index: python_reader.py
===================================================================
RCS file: /cvs/pyrepl/pyrepl/pyrepl/python_reader.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** python_reader.py	16 May 2003 13:51:14 -0000	1.9
--- python_reader.py	16 May 2003 13:56:26 -0000	1.10
***************
*** 30,49 ****
      import pickle
  
! if not hasattr(codeop, "CommandCompiler"):
!     def default_compile(string, fname, mode):
!         return compile(string, fname, mode)
! 
!     _code = copy_code.copy_code_with_changes(
!         default_compile.func_code,
!         flags = default_compile.func_code.co_flags|16)
! 
!     nested_compile = new.function(_code, globals(), "nested_compile")
! 
!     del _code, default_compile
! 
!     def CommandCompiler():
!         return codeop.compile_command
! else:
!     CommandCompiler = code.CommandCompiler
  
  def eat_it(*args):
--- 30,34 ----
      import pickle
  
! CommandCompiler = code.CommandCompiler
  
  def eat_it(*args):
***************
*** 154,158 ****
          self.II_init(locals)
          self.compiler = CommandCompiler()
!         self.compile = getattr(self.compiler, "compiler", compile)
          self.reader = PythonicReader(console, locals, self.compiler)
          locals['Reader'] = self.reader
--- 139,143 ----
          self.II_init(locals)
          self.compiler = CommandCompiler()
!         self.compile = self.compiler.compiler
          self.reader = PythonicReader(console, locals, self.compiler)
          locals['Reader'] = self.reader
***************
*** 176,181 ****
              code = self.compile("# coding:utf8\n"+text.encode('utf-8'),
                                  '<input>', 'single')
-             if code.co_flags & 16:
-                 self.compile = nested_compile
          except (OverflowError, SyntaxError, ValueError):
              self.showsyntaxerror("<input>")
--- 161,164 ----