[Pydev-cvs] org.python.pydev/PySrc importsTipper.py,1.2,1.3 pycompletionserver.py,1.9,1.10 refactori
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2004-09-17 19:22:14
|
Update of /cvsroot/pydev/org.python.pydev/PySrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2281/PySrc Modified Files: importsTipper.py pycompletionserver.py refactoring.py test_simpleTipper.py Log Message: Making refactoring. Index: test_simpleTipper.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/PySrc/test_simpleTipper.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_simpleTipper.py 17 Sep 2004 17:35:55 -0000 1.4 --- test_simpleTipper.py 17 Sep 2004 19:22:04 -0000 1.5 *************** *** 99,103 **** def testImports(self): ! importsTipper.GenerateTip('qt.') importsTipper.GenerateTip('scbr.') importsTipper.GenerateImportsTip(['scbr']) --- 99,103 ---- def testImports(self): ! print importsTipper.GenerateTip('qt.') importsTipper.GenerateTip('scbr.') importsTipper.GenerateImportsTip(['scbr']) Index: pycompletionserver.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/PySrc/pycompletionserver.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pycompletionserver.py 17 Sep 2004 17:35:55 -0000 1.9 --- pycompletionserver.py 17 Sep 2004 19:22:04 -0000 1.10 *************** *** 41,45 **** if self.processMsgFunc != None: ! s = MSG_PROCESSING_PROGRESS % self.processMsgFunc() self.socket.send(s) else: --- 41,45 ---- if self.processMsgFunc != None: ! s = MSG_PROCESSING_PROGRESS % urllib.quote_plus(self.processMsgFunc()) self.socket.send(s) else: Index: importsTipper.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/PySrc/importsTipper.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** importsTipper.py 17 Sep 2004 17:35:55 -0000 1.2 --- importsTipper.py 17 Sep 2004 19:22:04 -0000 1.3 *************** *** 56,60 **** splitted = data.split('.') - print splitted return GenerateImportsTip(splitted) --- 56,59 ---- *************** *** 69,73 **** mods += ParseDir(d) - print mods if len(tokenList) == 0: return mods --- 68,71 ---- *************** *** 91,94 **** --- 89,96 ---- elif os.path.isdir(mod[1]): return GenerateImportsTip(newTokenList, [mod[1]], completeModule) + + else: + mod = myImport(completeModule) + return GenerateImportsTipForModule(newTokenList, mod) raise RuntimeError('Unable to complete.') Index: refactoring.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/PySrc/refactoring.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** refactoring.py 17 Sep 2004 17:35:55 -0000 1.4 --- refactoring.py 17 Sep 2004 19:22:04 -0000 1.5 *************** *** 30,34 **** msg = '' i -= 1 ! return urllib.quote(msg) def getLastProgressMsgs(self, v): --- 30,34 ---- msg = '' i -= 1 ! return msg def getLastProgressMsgs(self, v): *************** *** 42,46 **** pass i -= 1 ! return urllib.quote(msg) def init(self): --- 42,46 ---- pass i -= 1 ! return msg def init(self): *************** *** 114,118 **** f = func(*msgSplit) releaseRefactorerBuffers() ! s = urllib.quote(f) return 'REFACTOR_OK:%s\nEND@@'%(s) except: --- 114,118 ---- f = func(*msgSplit) releaseRefactorerBuffers() ! s = urllib.quote_plus(f) return 'REFACTOR_OK:%s\nEND@@'%(s) except: *************** *** 134,138 **** releaseRefactorerBuffers() restartRefactorer() ! s = urllib.quote(s.getvalue()) return 'ERROR:%s\nEND@@'%(s) --- 134,138 ---- releaseRefactorerBuffers() restartRefactorer() ! s = urllib.quote_plus(s.getvalue()) return 'ERROR:%s\nEND@@'%(s) |