From 1fbf9f4aa38a460c46b80bb8f8a1ffc2103e10cb Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 5 May 2009 07:00:19 -0400
Subject: Lint clean-ups.

---
 coverage/__init__.py  | 12 ++++++------
 coverage/cmdline.py   |  1 +
 coverage/collector.py | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'coverage')

diff --git a/coverage/__init__.py b/coverage/__init__.py
index 826c67de..09b1567b 100644
--- a/coverage/__init__.py
+++ b/coverage/__init__.py
@@ -17,18 +17,18 @@ from coverage.misc import CoverageException
 
 # Module-level functions.  The original API to this module was based on
 # functions defined directly in the module, with a singleton of the coverage()
-# class.  This design hampered programmability.  Here we define the top-level
+# class.  That design hampered programmability.  Here we define the top-level
 # functions to create the singleton when they are first called.
 
 # Singleton object for use with module-level functions.  The singleton is
 # created as needed when one of the module-level functions is called.
-the_coverage = None
+_the_coverage = None
 
 def call_singleton_method(name, args, kwargs):
-    global the_coverage
-    if not the_coverage:
-        the_coverage = coverage()
-    return getattr(the_coverage, name)(*args, **kwargs)
+    global _the_coverage
+    if not _the_coverage:
+        _the_coverage = coverage()
+    return getattr(_the_coverage, name)(*args, **kwargs)
 
 mod_funcs = """
     use_cache start stop erase exclude
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 6086c62d..89d0b270 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -58,6 +58,7 @@ class CoverageScript:
     def __init__(self):
         import coverage
         self.covpkg = coverage
+        self.coverage = None
 
     def help(self, error=None):
         """Display an error message, or the usage for Coverage."""
diff --git a/coverage/collector.py b/coverage/collector.py
index f9bb3177..b6ca19bd 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -128,7 +128,7 @@ class Collector:
     def start(self):
         """Start collecting trace information."""
         if self._collectors:
-            self._collectors[-1]._pause()
+            self._collectors[-1].pause()
         self._collectors.append(self)
         # Install the tracer on this thread.
         self._start_tracer()
@@ -150,16 +150,16 @@ class Collector:
         # (if any).
         self._collectors.pop()
         if self._collectors:
-            self._collectors[-1]._resume()
+            self._collectors[-1].resume()
 
-    def _pause(self):
-        """Stop tracing, but be prepared to _resume."""
+    def pause(self):
+        """Pause tracing, but be prepared to `resume`."""
         for tracer in self.tracers:
             tracer.stop()
         threading.settrace(None)
         
-    def _resume(self):
-        """Resume tracing after a _pause."""
+    def resume(self):
+        """Resume tracing after a `pause`."""
         for tracer in self.tracers:
             tracer.start()
         threading.settrace(self._installation_trace)
-- 
cgit v1.2.1