Merge branch '0.20.x'

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -64,6 +64,8 @@ Bugs fixed
 * Syntax highlighting in ``cython-mode.el`` for Emacs no longer
   incorrectly highlights keywords found as part of longer names.
 
+* Correctly handle `from cython.submodule comport name``.
+
 Other changes
 -------------
 

Cython/Compiler/ParseTreeTransforms.py

@@ -778,10 +778,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
                     # from cython.parallel cimport parallel, prange, ...
                     self.parallel_directives[as_name or name] = qualified_name
                 elif self.is_cython_directive(full_name):
-                    if as_name is None:
-                        as_name = full_name
-
-                    self.directive_names[as_name] = full_name
+                    self.directive_names[as_name or name] = full_name
                     if kind is not None:
                         self.context.nonfatal_error(PostParseError(pos,
                             "Compiler directive imports must be plain imports"))

tests/run/unop_extras.pyx

 cimport cython.operator
+from cython.operator cimport dereference
+from cython.operator cimport dereference as deref
 
 def test_deref(int x):
     """
     >>> test_deref(3)
-    3
+    (3, 3, 3)
     >>> test_deref(5)
-    5
+    (5, 5, 5)
     """
     cdef int* x_ptr = &x
-    return cython.operator.dereference(x_ptr)
+    return cython.operator.dereference(x_ptr), dereference(x_ptr), deref(x_ptr)
 
 def increment_decrement(int x):
     """