pysmell/__init__.py pysmell/codefinder.py pysmell/idehelper.py pysmell/matchers.py pysmell/pysmell.py pysmell/vimhelper.py @@ -2,7 +2,7 @@ import unittest from textwrap import dedent import subprocess import os -import idehelper +import pysmell.idehelper class FunctionalTest(unittest.TestCase): def setUp(self): @@ -89,7 +89,7 @@ class FunctionalTest(unittest.TestCase): def testMultiPackage(self): if os.path.exists('TestData/PYSMELLTAGS'): os.remove('TestData/PYSMELLTAGS') - subprocess.call(["python", "../pysmell.py", "PackageA", "PackageB"], cwd='TestData') + subprocess.call(["pysmell", "PackageA", "PackageB"], cwd='TestData') self.assertTrue(os.path.exists('TestData/PYSMELLTAGS')) PYSMELLDICT = eval(open('TestData/PYSMELLTAGS').read()) expectedDict = {} @@ -104,20 +104,20 @@ class FunctionalTest(unittest.TestCase): def testPackageA(self): if os.path.exists('TestData/PYSMELLTAGS'): os.remove('TestData/PYSMELLTAGS') - subprocess.call(["python", "../pysmell.py", "PackageA"], cwd='TestData') + subprocess.call(["pysmell", "PackageA"], cwd='TestData') self.assertTrue(os.path.exists('TestData/PYSMELLTAGS')) PYSMELLDICT = eval(open('TestData/PYSMELLTAGS').read()) expectedDict = self.packageA self.assertDictsEqual(PYSMELLDICT, expectedDict) - foundDict = idehelper.findPYSMELLDICT(os.path.join('TestData', 'PackageA', 'something')) + foundDict = pysmell.idehelper.findPYSMELLDICT(os.path.join('TestData', 'PackageA', 'something')) self.assertDictsEqual(foundDict, expectedDict) def testPackageB(self): if os.path.exists('TestData/PYSMELLTAGS'): os.remove('TestData/PYSMELLTAGS') - subprocess.call(["python", "../pysmell.py", "PackageB"], cwd='TestData') + subprocess.call(["pysmell", "PackageB"], cwd='TestData') self.assertTrue(os.path.exists('TestData/PYSMELLTAGS')) PYSMELLDICT = eval(open('TestData/PYSMELLTAGS').read()) expectedDict = self.packageB @@ -127,7 +127,7 @@ class FunctionalTest(unittest.TestCase): def testPackageDot(self): if os.path.exists('TestData/PackageA/PYSMELLTAGS'): os.remove('TestData/PackageA/PYSMELLTAGS') - subprocess.call(["python", "../../pysmell.py", "."], cwd='TestData/PackageA') + subprocess.call(["pysmell", "."], cwd='TestData/PackageA') self.assertTrue(os.path.exists('TestData/PackageA/PYSMELLTAGS')) PYSMELLDICT = eval(open('TestData/PackageA/PYSMELLTAGS').read()) expectedDict = self.packageA @@ -137,7 +137,7 @@ class FunctionalTest(unittest.TestCase): def testAllPackages(self): if os.path.exists('TestData/PYSMELLTAGS'): os.remove('TestData/PYSMELLTAGS') - subprocess.call(["python", "../pysmell.py", "."], cwd='TestData') + subprocess.call(["pysmell", "."], cwd='TestData') self.assertTrue(os.path.exists('TestData/PYSMELLTAGS')) PYSMELLDICT = eval(open('TestData/PYSMELLTAGS').read()) expectedDict = {} @@ -156,7 +156,7 @@ class FunctionalTest(unittest.TestCase): path = 'TestData/PackageA/NestedPackage/EvenMore/' if os.path.exists('%sPYSMELLTAGS' % path): os.remove('%sPYSMELLTAGS' % path) - subprocess.call(["python", "../../../../pysmell.py", "ModuleC.py"], cwd=path) + subprocess.call(["pysmell", "ModuleC.py"], cwd=path) self.assertTrue(os.path.exists('%sPYSMELLTAGS' % path )) PYSMELLDICT = eval(open('%sPYSMELLTAGS' % path).read()) expectedDict = { @@ -175,7 +175,7 @@ class FunctionalTest(unittest.TestCase): pysmell = os.path.join(path, 'PYSMELLTAGS') if os.path.exists(pysmell): os.remove(pysmell) - subprocess.call(["python", "../pysmell.py", os.path.join("PackageA", "NestedPackage", "EvenMore", "ModuleC.py")], cwd=path) + subprocess.call(["pysmell", os.path.join("PackageA", "NestedPackage", "EvenMore", "ModuleC.py")], cwd=path) self.assertTrue(os.path.exists(pysmell)) PYSMELLDICT = eval(open(pysmell).read()) expectedDict = { @@ -193,7 +193,7 @@ class FunctionalTest(unittest.TestCase): def testOutputRedirect(self): if os.path.exists('TestData/OUTPUTREDIR'): os.remove('TestData/OUTPUTREDIR') - subprocess.call(["python", "../pysmell.py", "PackageA", "-o", + subprocess.call(["pysmell", "PackageA", "-o", "OUTPUTREDIR"], cwd='TestData') self.assertTrue(os.path.exists('TestData/OUTPUTREDIR')) PYSMELLDICT = eval(open('TestData/OUTPUTREDIR').read()) @@ -203,7 +203,7 @@ class FunctionalTest(unittest.TestCase): absPath = os.path.join(os.getcwd(), 'TestData', 'OUTPUTREDIR2') if os.path.exists(absPath): os.remove(absPath) - subprocess.call(["python", "../pysmell.py", "PackageA", "-o", absPath], cwd='TestData') + subprocess.call(["pysmell", "PackageA", "-o", absPath], cwd='TestData') self.assertTrue(os.path.exists(absPath)) PYSMELLDICT = eval(open(absPath).read()) expectedDict = self.packageA @@ -211,7 +211,7 @@ class FunctionalTest(unittest.TestCase): def testNoArgs(self): - proc = subprocess.Popen(["python", "pysmell.py"], stdout=subprocess.PIPE) + proc = subprocess.Popen(["pysmell"], stdout=subprocess.PIPE) proc.wait() stdout = proc.stdout.read() expected = dedent("""\ Tests/functional_test.py @@ -5,7 +5,7 @@ import compiler from compiler.visitor import ExampleASTVisitor from pprint import pformat -from codefinder import CodeFinder, getClassAndParents, ModuleDict, findPackage +from pysmell.codefinder import CodeFinder, getClassAndParents, ModuleDict, findPackage class ModuleDictTest(unittest.TestCase): def testUpdate(self): @@ -235,7 +235,7 @@ class CodeFinderTest(unittest.TestCase): def testArgToStr(self): - from codefinder import argToStr + from pysmell.codefinder import argToStr self.assertEquals(argToStr('stuff'), 'stuff') self.assertEquals(argToStr(('ala', 'ma', 'kota')), '(ala, ma, kota)') self.assertEquals(argToStr((('x1', 'y1'), ('x2', 'y2'))), '((x1, y1), (x2, y2))') @@ -282,15 +282,15 @@ class CodeFinderTest(unittest.TestCase): def testRelativeImports(self): - import codefinder - oldExists = codefinder.os.path.exists + import pysmell.codefinder + oldExists = pysmell.codefinder.os.path.exists # monkeypatch relative.py into the path somewhere paths = [] def mockExists(path): paths.append(path) return True - codefinder.os.path.exists = mockExists + pysmell.codefinder.os.path.exists = mockExists try: out = self.getModule(""" @@ -309,7 +309,7 @@ class CodeFinderTest(unittest.TestCase): ] self.assertEquals(paths, expectedPaths) finally: - codefinder.os.path.exists = oldExists + pysmell.codefinder.os.path.exists = oldExists def testHierarchy(self): Tests/test_codefinder.py @@ -2,7 +2,7 @@ import unittest from textwrap import dedent import os -from idehelper import findCompletions, CompletionOptions, Types +from pysmell.idehelper import findCompletions, CompletionOptions, Types def compMeth(name, klass): Tests/test_completions.py @@ -2,7 +2,7 @@ import unittest import os from textwrap import dedent -from idehelper import inferClass, detectCompletionType, CompletionOptions, findPYSMELLDICT, Types +from pysmell.idehelper import inferClass, detectCompletionType, CompletionOptions, findPYSMELLDICT, Types NESTEDDICT = { 'CONSTANTS' : [], 'FUNCTIONS' : [], @@ -29,9 +29,9 @@ class IDEHelperTest(unittest.TestCase): # include everything that starts with PYSMELLTAGS if os.path.exists('PYSMELLTAGS'): os.remove('PYSMELLTAGS') - import idehelper - oldTryReadPSD = idehelper.tryReadPYSMELLDICT - oldListDir = idehelper.listdir + import pysmell.idehelper + oldTryReadPSD = pysmell.idehelper.tryReadPYSMELLDICT + oldListDir = pysmell.idehelper.listdir TRPArgs = [] def mockTRP(direct, fname, dictToUpdate): TRPArgs.append((direct, fname)) @@ -44,8 +44,8 @@ class IDEHelperTest(unittest.TestCase): os.path.join('random', 'dirA'): ['PYSMELLTAGS.django'], }.get(dirname, []) - idehelper.tryReadPYSMELLDICT = mockTRP - idehelper.listdir = mockListDir + pysmell.idehelper.tryReadPYSMELLDICT = mockTRP + pysmell.idehelper.listdir = mockListDir try: self.assertEquals(findPYSMELLDICT(os.path.join('a', 'random', 'path', 'andfile')), None, 'should not find PYSMELLTAGS') self.assertEquals(listdirs, @@ -69,8 +69,8 @@ class IDEHelperTest(unittest.TestCase): 'did not read tags correctly: %s' % TRPArgs) finally: - idehelper.tryReadPYSMELLDICT = oldTryReadPSD - idehelper.listdir = oldListDir + pysmell.idehelper.tryReadPYSMELLDICT = oldTryReadPSD + pysmell.idehelper.listdir = oldListDir def testInferClassAbsolute(self): source = dedent("""\ Tests/test_idehelper.py @@ -1,5 +1,5 @@ import unittest -from matchers import (matchCaseSensitively, matchCaseInsensitively, +from pysmell.matchers import (matchCaseSensitively, matchCaseInsensitively, matchCamelCased, matchSmartass, matchFuzzyCS, matchFuzzyCI, camelGroups) class MatcherTest(unittest.TestCase): Tests/test_matchers.py @@ -1,5 +1,5 @@ import unittest -from vimhelper import findWord, findBase +from pysmell.vimhelper import findWord, findBase class MockVim(object): class _current(object): @@ -15,8 +15,8 @@ class MockVim(object): class VimHelperTest(unittest.TestCase): def setUp(self): - import vimhelper - vimhelper.vim = self.vim = MockVim() + import pysmell.vimhelper + pysmell.vimhelper.vim = self.vim = MockVim() def testFindBaseName(self): self.vim.current.buffer = ['aaaa', 'bbbb', 'cccc'] Tests/test_vimhelper.py __init__.py codefinder.py idehelper.py matchers.py pysmell.py vimhelper.py 4db307e16a9aa462673dc07494e0522de34056ea Michael Thalmeier michael@thalmeier.at http://github.com/orestis/pysmell/commit/954054e0718a002fc4f11e454568aaf036b8c6b1 954054e0718a002fc4f11e454568aaf036b8c6b1 2008-10-24T08:10:20-07:00 2008-10-24T08:10:20-07:00 added setuptools support 1d45185ce33a40debae41d7b1e5930ea46e9b6f1 Michael Thalmeier michael@thalmeier.at