[ctypes-commit] ctypes/comtypes/tools tlbparser.py,1.4.2.4,1.4.2.5

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/comtypes/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4979

Modified Files:
      Tag: branch_1_0
	tlbparser.py 
Log Message:
Use decorators in generated code only for those Python versions that
can handle it.
Cleanup imports.


Index: tlbparser.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/comtypes/tools/tlbparser.py,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -d -r1.4.2.4 -r1.4.2.5
*** tlbparser.py	30 Jun 2005 17:20:44 -0000	1.4.2.4
--- tlbparser.py	30 Jun 2005 19:29:25 -0000	1.4.2.5
***************
*** 1,6 ****
! ##from comtypes import _automation as automation
! import comtypes.automation as automation
! import comtypes.typeinfo as typeinfo
! import typedesc
  
  ################################
--- 1,5 ----
! import sys
! from comtypes import automation, typeinfo
! from comtypes.tools import typedesc
  
  ################################
***************
*** 596,600 ****
  
      gen = Generator(sys.stdout,
!                     use_decorators=True,
                      known_symbols=known_symbols,
  ##                    searched_dlls=None,
--- 595,599 ----
  
      gen = Generator(sys.stdout,
!                     use_decorators=sys.version_info >= (2, 4),
                      known_symbols=known_symbols,
  ##                    searched_dlls=None,
***************
*** 602,606 ****
      gen.generate_code(items.values())
  
! def generate_module(tlib, ofi):
      known_symbols = {}
      for name in ("comtypes.typeinfo", "comtypes.automation", "comtypes", "ctypes"):
--- 601,605 ----
      gen.generate_code(items.values())
  
! def generate_module(tlib, ofi, make_module):
      known_symbols = {}
      for name in ("comtypes.typeinfo", "comtypes.automation", "comtypes", "ctypes"):
***************
*** 617,621 ****
  
      gen = Generator(ofi,
!                     use_decorators=True,
                      known_symbols=known_symbols,
                      )
--- 616,620 ----
  
      gen = Generator(ofi,
!                     use_decorators=sys.version_info >= (2, 4),
                      known_symbols=known_symbols,
                      )