Merged 4.0 to default

1 files changed, 5 insertions, 1 deletions

diff --git a/coverage/misc.py b/coverage/misc.py
index c3fd9e2..c88d4ec 100644
--- a/coverage/misc.py
+++ b/coverage/misc.py
@@ -37,6 +37,8 @@ def format_lines(statements, lines):
     i = 0
     j = 0
     start = None
+    statements = sorted(statements)
+    lines = sorted(lines)
     while i < len(statements) and j < len(lines):
         if statements[i] == lines[j]:
             if start == None:
@@ -111,8 +113,10 @@ class Hasher(object):
         self.md5.update(to_bytes(str(type(v))))
         if isinstance(v, string_class):
             self.md5.update(to_bytes(v))
+        elif v is None:
+            pass
         elif isinstance(v, (int, float)):
-            self.update(str(v))
+            self.md5.update(to_bytes(str(v)))
         elif isinstance(v, (tuple, list)):
             for e in v:
                 self.update(e)