[Pydev-cvs] org.python.pydev/PySrc test_pyserver.py,1.1,1.2 pycompletionserver.py,1.3,1.4 simpleTipper.py,1.1,1.2

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/PySrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1125/PySrc

Modified Files:
	test_pyserver.py pycompletionserver.py simpleTipper.py 
Log Message:
New code completion.

Index: pycompletionserver.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/pycompletionserver.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pycompletionserver.py	10 Sep 2004 19:42:23 -0000	1.3
--- pycompletionserver.py	13 Sep 2004 17:11:50 -0000	1.4
***************
*** 34,38 ****
  
      def removeInvalidChars(self, msg):
!         return msg.replace(',','').replace('(','').replace(')','')
      
      def formatCompletionMessage(self, completionsList):
--- 34,40 ----
  
      def removeInvalidChars(self, msg):
!         if msg:
!             return msg.replace(',','').replace('(','').replace(')','')
!         return ' '
      
      def formatCompletionMessage(self, completionsList):

Index: simpleTipper.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/simpleTipper.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simpleTipper.py	10 Sep 2004 19:42:23 -0000	1.1
--- simpleTipper.py	13 Sep 2004 17:11:51 -0000	1.2
***************
*** 37,51 ****
  ''' % (token,token)
      
!         
      
      import simpleinspect
      import compiler
!     __eraseThis = compiler.compile(theDoc, 'temporary', 'exec')
! 
!     simpleinspect.__eraseThisTips = []
!     simpleinspect.GenerateTip (__eraseThis)
!     toReturn = simpleinspect.__eraseThisTips
!     simpleinspect.__eraseThisTips = []
!     return toReturn
      
  
--- 37,56 ----
  ''' % (token,token)
      
!     
      
      import simpleinspect
      import compiler
!     try:
!         __eraseThis = compiler.compile(theDoc, 'temporary', 'exec')
!     
!         simpleinspect.__eraseThisTips = []
!         simpleinspect.GenerateTip (__eraseThis)
!         toReturn = simpleinspect.__eraseThisTips
!         simpleinspect.__eraseThisTips = []
!         return toReturn
!     except :
!         import sys
!         s = str(sys.exc_info()[1])
!         return [('ERROR_COMPLETING',s)]
      
  

Index: test_pyserver.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/test_pyserver.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_pyserver.py	10 Sep 2004 19:42:23 -0000	1.1
--- test_pyserver.py	13 Sep 2004 17:11:50 -0000	1.2
***************
*** 46,50 ****
  
          connToRead, addr = sToRead.accept()
- #        print 'test connected addr', addr
          
          
--- 46,49 ----
***************
*** 64,68 ****
          self.assert_('END@@' in completions)
  
!         
          self.sendKillMsg(sToWrite)
          
--- 63,87 ----
          self.assert_('END@@' in completions)
  
!         s = \
! '''
! class C(object):          
!                            
!     def __init__(self):           
!                           
!         print dir(self)       
!                              
!     def a(self):                
!         pass                             
!                                  
!                                 
!     def b(self):                   
!         self.a                    
!                                 
!         pass            
! '''     
! 
!         sToWrite.send('@@TOKEN_GLOBALS(C):%s\nEND@@'%s) 
!         completions = connToRead.recv(4086)
! 
          self.sendKillMsg(sToWrite)