More refactoring.

Author: Nurdok

setup.py

@@ -3,7 +3,9 @@
 from setuptools import setup
 
 
-with open(os.path.join('src', 'pydocstyle', 'utils.py')) as f:
+this_dir = os.path.dirname(__file__)
+
+with open(os.path.join(this_dir, 'src', 'pydocstyle', 'utils.py')) as f:
     for line in f:
         if line.startswith('__version__'):
             version = eval(line.split('=')[-1])
@@ -27,8 +29,9 @@
         'License :: OSI Approved :: MIT License',
     ],
     keywords='pydocstyle, PEP 257, pep257, PEP 8, pep8, docstrings',
-    package_dir={'pydocstyle': 'src/pydocstyle'},
-    #py_modules=['pydocstyle'],
+    packages=('pydocstyle',),
+    py_modules=('main',),
+    package_dir={'': 'src'},
     entry_points={
         'console_scripts': [
             'pydocstyle = pydocstyle.cli:main',

src/pydocstyle/tests/test_decorators.py

@@ -2,16 +2,14 @@
 
 Use tox or py.test to run the test suite.
 """
-import checker
-
 try:
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
 
 import textwrap
 
-from .. import pydocstyle, parser
+from .. import parser, checker
 
 
 __all__ = ()

src/pydocstyle/tests/test_integration.py

@@ -4,7 +4,6 @@
 
 from __future__ import with_statement
 from collections import namedtuple
-from functools import partial
 
 import sys
 import os