diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py index a031c5de16e8d4d181e646cdb7e1393d7ff85bd5..5fd6f0de2c6faa231afd2e14526a034cf17e0420 100644 --- a/Cython/Compiler/Main.py +++ b/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 diff --git a/Cython/Includes/cpython/__init__.pyx b/Cython/Includes/cpython/__init__.pyx deleted file mode 100644 index fa81adaff68e06d8e915a6afa375f62f7e5a8fad..0000000000000000000000000000000000000000 --- a/Cython/Includes/cpython/__init__.pyx +++ /dev/null @@ -1 +0,0 @@ -# empty file diff --git a/Cython/Includes/libc/__init__.pyx b/Cython/Includes/libc/__init__.pyx deleted file mode 100644 index fa81adaff68e06d8e915a6afa375f62f7e5a8fad..0000000000000000000000000000000000000000 --- a/Cython/Includes/libc/__init__.pyx +++ /dev/null @@ -1 +0,0 @@ -# empty file diff --git a/Cython/Includes/libcpp/__init__.pyx b/Cython/Includes/libcpp/__init__.pyx deleted file mode 100644 index fa81adaff68e06d8e915a6afa375f62f7e5a8fad..0000000000000000000000000000000000000000 --- a/Cython/Includes/libcpp/__init__.pyx +++ /dev/null @@ -1 +0,0 @@ -# empty file diff --git a/tests/run/dict_get.pyx b/tests/run/dict_get.pyx index d5d905e567cced62fe350d2d244efdbd855fc366..3df021761e0c5c53bc0b5242405f57eea577bfc6 100644 --- a/tests/run/dict_get.pyx +++ b/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