diff -r 04896c4a5a8e -r 599681bf149a DebugClients/Python/coverage/data.py
--- a/DebugClients/Python/coverage/data.py Sun Aug 23 11:31:11 2015 +0200
+++ b/DebugClients/Python/coverage/data.py Sun Aug 23 11:37:17 2015 +0200
@@ -1,6 +1,7 @@
"""Coverage data for Coverage."""
import os
+import sys
from .backward import iitems, pickle, sorted # pylint: disable=W0622
from .files import PathAliases
@@ -101,13 +102,15 @@
def line_data(self):
"""Return the map from filenames to lists of line numbers executed."""
return dict(
- [(f, sorted(lmap.keys())) for f, lmap in iitems(self.lines)]
+ [(f.decode(sys.getfilesystemencoding()), sorted(lmap.keys()))
+ for f, lmap in iitems(self.lines)]
)
def arc_data(self):
"""Return the map from filenames to lists of line number pairs."""
return dict(
- [(f, sorted(amap.keys())) for f, amap in iitems(self.arcs)]
+ [(f.decode(sys.getfilesystemencoding()), sorted(amap.keys()))
+ for f, amap in iitems(self.arcs)]
)
def write_file(self, filename):
@@ -163,12 +166,14 @@
if isinstance(data, dict):
# Unpack the 'lines' item.
lines = dict([
- (f, dict.fromkeys(linenos, None))
+ (f.encode(sys.getfilesystemencoding()),
+ dict.fromkeys(linenos, None))
for f, linenos in iitems(data.get('lines', {}))
])
# Unpack the 'arcs' item.
arcs = dict([
- (f, dict.fromkeys(arcpairs, None))
+ (f.encode(sys.getfilesystemencoding()),
+ dict.fromkeys(arcpairs, None))
for f, arcpairs in iitems(data.get('arcs', {}))
])
except Exception:
