Set the context in the data

Author: nedbat

coverage/collector.py

@@ -101,6 +101,8 @@ def __init__(self, should_trace, check_include, timid, branch, warn, concurrency
         self.threading = None
         self.covdata = None
 
+        self.static_context = None
+
         self.origin = short_stack()
 
         self.concur_id_func = None
@@ -161,9 +163,11 @@ def __init__(self, should_trace, check_include, timid, branch, warn, concurrency
     def __repr__(self):
         return "<Collector at 0x%x: %s>" % (id(self), self.tracer_name())
 
-    def use_data(self, covdata):
+    def use_data(self, covdata, context):
         """Use `covdata` for recording data."""
         self.covdata = covdata
+        self.static_context = context
+        self.covdata.set_context(self.static_context)
 
     def tracer_name(self):
         """Return the class name of the tracer we're using."""

coverage/control.py

@@ -366,6 +366,8 @@ def _init_for_start(self):
 
         self._init_data(suffix)
 
+        self._collector.use_data(self._data, self.config.context)
+
         # Early warning if we aren't going to be able to support plugins.
         if self._plugins.file_tracers and not self._collector.supports_plugins:
             self._warn(
@@ -401,9 +403,6 @@ def _init_data(self, suffix):
                 debug=self._debug,
             )
 
-        if self._collector is not None:
-            self._collector.use_data(self._data)
-
     def start(self):
         """Start measuring code coverage.
 

coverage/sqldata.py

@@ -111,7 +111,7 @@ def _create_db(self):
         self._db = Sqlite(self.filename, self._debug)
         with self._db:
             for stmt in SCHEMA.split(';'):
-                stmt = stmt.strip()
+                stmt = " ".join(stmt.strip().split())
                 if stmt:
                     self._db.execute(stmt)
             self._db.execute("insert into coverage_schema (version) values (?)", (SCHEMA_VERSION,))