Merged ned/coveragepy into default

1 files changed, 2 insertions, 2 deletions

diff --git a/coverage/html.py b/coverage/html.py
index 6e21efa..91ae2c2 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -165,7 +165,7 @@ class HtmlReporter(Reporter):
         # If need be, determine the encoding of the source file. We use it
         # later to properly write the HTML.
         if sys.version_info < (3, 0):
-            encoding = cu.source_encoding(source)
+            encoding = cu.source_encoding()
             # Some UTF8 files have the dreaded UTF8 BOM. If so, junk it.
             if encoding.startswith("utf-8") and source[:3] == "\xef\xbb\xbf":
                 source = source[3:]
@@ -185,7 +185,7 @@ class HtmlReporter(Reporter):
 
         lines = []
 
-        for lineno, line in enumerate(cu.source_token_lines(source), start=1):
+        for lineno, line in enumerate(cu.source_token_lines(), start=1):
             # Figure out how to mark this line.
             line_class = []
             annotate_html = ""