# HG changeset patch
# User cmlenz
# Date 1124319532 0
# Node ID 4289fa18de0f09d2962da19f59ebda86945b04be
# Parent  f34d2b9d9556ff39b49e2c367abf2472a820ebd6
 * Clean up some imports.
 * Split long line in Makefile.

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,6 @@
 all: pylint
 
 pylint:
-	PYTHONPATH=$(PYTHONPATH) pylint --parseable=y --disable-msg=$(PYLINT_MSGS) --ignore=tests bitten > build/pylint-results.txt
+	PYTHONPATH=$(PYTHONPATH) pylint --parseable=yes --include-ids=yes \
+	--disable-msg=$(PYLINT_MSGS) --ignore=tests \
+	bitten > build/pylint-results.txt
diff --git a/bitten/trac_ext/main.py b/bitten/trac_ext/main.py
--- a/bitten/trac_ext/main.py
+++ b/bitten/trac_ext/main.py
@@ -18,7 +18,7 @@
 #
 # Author: Christopher Lenz <cmlenz@gmx.de>
 
-import os.path
+import os
 
 from trac.core import *
 from trac.env import IEnvironmentSetupParticipant
diff --git a/bitten/trac_ext/web_ui.py b/bitten/trac_ext/web_ui.py
--- a/bitten/trac_ext/web_ui.py
+++ b/bitten/trac_ext/web_ui.py
@@ -18,9 +18,7 @@
 #
 # Author: Christopher Lenz <cmlenz@gmx.de>
 
-import os.path
 import re
-import sys
 from time import localtime, strftime
 
 import pkg_resources
@@ -29,7 +27,7 @@
 from trac.util import escape, pretty_timedelta
 from trac.web.chrome import INavigationContributor, ITemplateProvider, \
                             add_link, add_stylesheet
-from trac.web.main import IRequestHandler
+from trac.web import IRequestHandler
 from trac.wiki import wiki_to_html
 from bitten.model import BuildConfig, TargetPlatform, Build, BuildStep, BuildLog
 from bitten.store import ReportStore
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -21,9 +21,7 @@
 
 import ez_setup
 ez_setup.use_setuptools()
-
 from setuptools import setup, find_packages
-from distutils import util
 
 from bitten import __version__ as VERSION
 from bitten.util.testrunner import unittest