diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2011-04-10 08:42:31 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2011-04-10 08:42:31 -0400 |
| commit | 52e07c90b77b1d07ed95a6195ec5d895f0988224 (patch) | |
| tree | 325346a20aedac88b3297919f5c1c89f79de7aed /coverage/files.py | |
| parent | d4dd809d27ad7f31431a4ef61309b6951ad41d9b (diff) | |
| parent | 822b7c82f58bbd6f2b38cc98c7881cc405d0c69e (diff) | |
| download | python-coveragepy-52e07c90b77b1d07ed95a6195ec5d895f0988224.tar.gz | |
Merge Brett's __main__.py file for the tree.
Diffstat (limited to 'coverage/files.py')
| -rw-r--r-- | coverage/files.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/coverage/files.py b/coverage/files.py index 9a8ac56..a68a0a7 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -1,5 +1,6 @@ """File wrangling.""" +from coverage.backward import to_string import fnmatch, os, sys class FileLocator(object): @@ -72,9 +73,7 @@ class FileLocator(object): data = zi.get_data(parts[1]) except IOError: continue - if sys.version_info >= (3, 0): - data = data.decode('utf8') # TODO: How to do this properly? - return data + return to_string(data) return None |