merge

Cython/Compiler/Main.py

@@ -417,7 +417,9 @@ class Context(object):
 
     def is_package_dir(self, dir_path):
         #  Return true if the given directory is a package directory.
-        for filename in ("__init__.py", "__init__.pyx"):
+        for filename in ("__init__.py", 
+                         "__init__.pyx", 
+                         "__init__.pxd"):
             path = os.path.join(dir_path, filename)
             if os.path.exists(path):
                 return 1

Cython/Includes/cpython/__init__.pyx

-# empty file

Cython/Includes/libc/__init__.pyx

-# empty file

Cython/Includes/libcpp/__init__.pyx

-# empty file

tests/run/dict_get.pyx

@@ -84,7 +84,7 @@ def get_default(dict d, key, default):
 def get_in_condition(dict d, key, expected_result):
     """
     >>> d = dict(a=1, b=2)
-    >>> getitem_in_condition(d, 'a', 1)
+    >>> get_in_condition(d, 'a', 1)
     True
     """
     return d.get(key) is expected_result