Merge branch '0.23.x'

CHANGES.rst

@@ -40,6 +40,8 @@ Other changes
 Bugs fixed
 ----------
 
+* Coverage plugin was adapted to coverage.py 4.0 beta 2.
+
 * C++ destructor calls could fail when '&' operator is overwritten.
 
 * Incorrect handling of large integers in compile-time evaluated DEF

Cython/Coverage.py

@@ -205,7 +205,7 @@ class Plugin(CoveragePlugin):
         if self._c_files_map is None:
             self._c_files_map = {}
 
-        for filename, code in code_lines.iteritems():
+        for filename, code in code_lines.items():
             abs_path = _find_dep_file_path(c_file, filename)
             self._c_files_map[abs_path] = (c_file, filename, code)
 
@@ -262,12 +262,15 @@ class CythonModuleReporter(FileReporter):
         self.c_file = c_file
         self._code = code
 
-    def statements(self):
-        return self._code.viewkeys()
+    def lines(self):
+        """
+        Return set of line numbers that are possibly executable.
+        """
+        return set(self._code)
 
     def _iter_source_tokens(self):
         current_line = 1
-        for line_no, code_line in sorted(self._code.iteritems()):
+        for line_no, code_line in sorted(self._code.items()):
             while line_no > current_line:
                 yield []
                 current_line += 1
@@ -275,6 +278,9 @@ class CythonModuleReporter(FileReporter):
             current_line += 1
 
     def source(self):
+        """
+        Return the source code of the file as a string.
+        """
         if os.path.exists(self.filename):
             with open_source_file(self.filename) as f:
                 return f.read()
@@ -284,6 +290,9 @@ class CythonModuleReporter(FileReporter):
                 for tokens in self._iter_source_tokens())
 
     def source_token_lines(self):
+        """
+        Iterate over the source code tokens.
+        """
         if os.path.exists(self.filename):
             with open_source_file(self.filename) as f:
                 for line in f: