Merge remote-tracking branch 'upstream/master' into MaxBo-patch-1

CHANGES.rst

@@ -41,6 +41,8 @@ Bugs fixed
 * Cython annotation types in Python files could lead to import failures
   with a "cython undefined" error.  Recognised types are now turned into strings.
 
+* Coverage analysis could fail to report on extension modules on some platforms.
+
 * Annotations could be parsed (and rejected) as types even with
   ``annotation_typing=False``.
 

Cython/Coverage.py

@@ -114,7 +114,7 @@ class Plugin(CoveragePlugin):
                 basename = basename[:platform_suffix.start()]
         elif ext == '.so':
             # Linux/Unix/Mac extension module
-            platform_suffix = re.search(r'[.]cpython-[0-9]+[a-z]*(?:-[a-z0-9]+)?$', basename, re.I)
+            platform_suffix = re.search(r'[.]cpython-[0-9]+[-_a-z0-9]*$', basename, re.I)
             if platform_suffix:
                 basename = basename[:platform_suffix.start()]
         elif ext == '.pxi':