From 9d13bbc6832162c1e1a7019ae2ae787cddf7cd9c Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sat, 3 May 2014 08:48:59 -0400
Subject: Small cleanups

---
 coverage/control.py | 3 ++-
 coverage/html.py    | 1 -
 coverage/results.py | 8 ++++----
 tests/test_files.py | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/coverage/control.py b/coverage/control.py
index 07551ff..44a70bf 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -214,7 +214,8 @@ class coverage(object):
 
     def _canonical_dir(self, morf):
         """Return the canonical directory of the module or file `morf`."""
-        return os.path.split(PythonCodeUnit(morf, self.file_locator).filename)[0]
+        morf_filename = PythonCodeUnit(morf, self.file_locator).filename
+        return os.path.split(morf_filename)[0]
 
     def _source_for_file(self, filename):
         """Return the source file for `filename`."""
diff --git a/coverage/html.py b/coverage/html.py
index d890436..15afca8 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -5,7 +5,6 @@ import os, re, shutil, sys
 import coverage
 from coverage.backward import pickle
 from coverage.misc import CoverageException, Hasher
-from coverage.phystokens import source_token_lines, source_encoding
 from coverage.report import Reporter
 from coverage.results import Numbers
 from coverage.templite import Templite
diff --git a/coverage/results.py b/coverage/results.py
index 79615c7..0832976 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -1,7 +1,6 @@
 """Results of coverage measurement."""
 
 import collections
-import os
 
 from coverage.backward import iitems
 from coverage.misc import format_lines, join_regex
@@ -25,9 +24,10 @@ class Analysis(object):
         self.statements, self.excluded = self.parser.parse_source()
 
         # Identify missing statements.
-        executed = self.parser.translate_lines(self.coverage.data.executed_lines(self.filename))
-        exec1 = self.parser.first_lines(executed)
-        self.missing = self.statements - exec1
+        executed = self.coverage.data.executed_lines(self.filename)
+        executed = self.parser.translate_lines(executed)
+        executed = self.parser.first_lines(executed)
+        self.missing = self.statements - executed
 
         if self.coverage.data.has_arcs():
             self.no_branch = self.parser.lines_matching(
diff --git a/tests/test_files.py b/tests/test_files.py
index 42457a5..f93feba 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -88,7 +88,6 @@ class MatcherTest(CoverageTest):
             (self.make_file("sub3/file4.py"), True),
             (self.make_file("sub3/file5.c"), False),
         ]
-        fl = FileLocator()
         fnm = FnmatchMatcher(["*.py", "*/sub2/*"])
         self.assertEqual(fnm.info(), ["*.py", "*/sub2/*"])
         for filepath, matches in matches_to_try:
-- 
cgit v1.2.1