summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-06-10 21:47:55 -0400
committerNed Batchelder <ned@nedbatchelder.com>2009-06-10 21:47:55 -0400
commit249adf08bee79f936be5ce716f75bb58a9e3101d (patch)
tree84fb67d29d4659758a719f3911a534f3e9ce7a93
parentf6dba4bec812a385e7c5d8e8dc1ee6d0ba592957 (diff)
downloadpython-coveragepy-git-249adf08bee79f936be5ce716f75bb58a9e3101d.tar.gz
Minor cleanup: don't use the types module so much.
-rw-r--r--coverage/codeunit.py4
-rw-r--r--coverage/data.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/coverage/codeunit.py b/coverage/codeunit.py
index a43ca942..a4e029b7 100644
--- a/coverage/codeunit.py
+++ b/coverage/codeunit.py
@@ -1,6 +1,6 @@
"""Code unit (module) handling for Coverage."""
-import glob, os, types
+import glob, os
def code_unit_factory(morfs, file_locator, omit_prefixes=None):
"""Construct a list of CodeUnits from polymorphic inputs.
@@ -15,7 +15,7 @@ def code_unit_factory(morfs, file_locator, omit_prefixes=None):
"""
# Be sure we have a list.
- if not isinstance(morfs, types.ListType):
+ if not isinstance(morfs, (list, tuple)):
morfs = [morfs]
# On Windows, the shell doesn't expand wildcards. Do it here.
diff --git a/coverage/data.py b/coverage/data.py
index 9e1e058f..c81e1e25 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -1,6 +1,6 @@
"""Coverage data for Coverage."""
-import os, types
+import os
import cPickle as pickle
class CoverageData:
@@ -121,7 +121,7 @@ class CoverageData:
data = pickle.load(fdata)
finally:
fdata.close()
- if isinstance(data, types.DictType):
+ if isinstance(data, dict):
# Unpack the 'lines' item.
lines = dict([
(f, dict([(l, True) for l in linenos]))