Merge pull request #2904 from jdemeyer/remove_includes_deprecated

Remove Cython/Includes/Deprecated

Cython/Compiler/Main.py

@@ -233,25 +233,6 @@ class Context(object):
         # for a dotted filename, and its containing package root
         # directory is searched first for a non-dotted filename.
         pxd = self.search_include_directories(qualified_name, ".pxd", pos, sys_path=sys_path)
-        if pxd is None: # XXX Keep this until Includes/Deprecated is removed
-            if (qualified_name.startswith('python') or
-                    qualified_name in ('stdlib', 'stdio', 'stl')):
-                standard_include_path = os.path.abspath(os.path.normpath(
-                        os.path.join(os.path.dirname(__file__), os.path.pardir, 'Includes')))
-                deprecated_include_path = os.path.join(standard_include_path, 'Deprecated')
-                self.include_directories.append(deprecated_include_path)
-                try:
-                    pxd = self.search_include_directories(qualified_name, ".pxd", pos)
-                finally:
-                    self.include_directories.pop()
-                if pxd:
-                    name = qualified_name
-                    if name.startswith('python'):
-                        warning(pos, "'%s' is deprecated, use 'cpython'" % name, 1)
-                    elif name in ('stdlib', 'stdio'):
-                        warning(pos, "'%s' is deprecated, use 'libc.%s'" % (name, name), 1)
-                    elif name in ('stl'):
-                        warning(pos, "'%s' is deprecated, use 'libcpp.*.*'" % name, 1)
         if pxd is None and Options.cimport_from_pyx:
             return self.find_pyx_file(qualified_name, pos)
         return pxd

Cython/Includes/Deprecated/python.pxd

-# Present for backwards compatibility
-from cpython cimport *

Cython/Includes/Deprecated/python_bool.pxd

-# Present for backwards compatibility
-from cpython.bool cimport *

Cython/Includes/Deprecated/python_buffer.pxd

-# Present for backwards compatibility
-from cpython.buffer cimport *

Cython/Includes/Deprecated/python_bytes.pxd

-# Present for backwards compatibility
-from cpython.bytes cimport *

Cython/Includes/Deprecated/python_cobject.pxd

-# Present for backwards compatibility
-from cpython.cobject cimport *

Cython/Includes/Deprecated/python_complex.pxd

-# Present for backwards compatibility
-from cpython.complex cimport *

Cython/Includes/Deprecated/python_dict.pxd

-# Present for backwards compatibility
-from cpython.dict cimport *

Cython/Includes/Deprecated/python_exc.pxd

-# Present for backwards compatibility
-from cpython.exc cimport *

Cython/Includes/Deprecated/python_float.pxd

-# Present for backwards compatibility
-from cpython.float cimport *

Cython/Includes/Deprecated/python_function.pxd

-# Present for backwards compatibility
-from cpython.function cimport *

Cython/Includes/Deprecated/python_getargs.pxd

-# Present for backwards compatibility
-from cpython.getargs cimport *

Cython/Includes/Deprecated/python_instance.pxd

-# Present for backwards compatibility
-from cpython.instance cimport *

Cython/Includes/Deprecated/python_int.pxd

-# Present for backwards compatibility
-from cpython.int cimport *

Cython/Includes/Deprecated/python_iterator.pxd

-# Present for backwards compatibility
-from cpython.iterator cimport *

Cython/Includes/Deprecated/python_list.pxd

-# Present for backwards compatibility
-from cpython.list cimport *

Cython/Includes/Deprecated/python_long.pxd

-# Present for backwards compatibility
-from cpython.long cimport *

Cython/Includes/Deprecated/python_mapping.pxd

-# Present for backwards compatibility
-from cpython.mapping cimport *

Cython/Includes/Deprecated/python_mem.pxd

-# Present for backwards compatibility
-from cpython.mem cimport *

Cython/Includes/Deprecated/python_method.pxd

-# Present for backwards compatibility
-from cpython.method cimport *

Cython/Includes/Deprecated/python_module.pxd

-# Present for backwards compatibility
-from cpython.module cimport *

Cython/Includes/Deprecated/python_number.pxd

-# Present for backwards compatibility
-from cpython.number cimport *

Cython/Includes/Deprecated/python_object.pxd

-# Present for backwards compatibility
-from cpython.object cimport *

Cython/Includes/Deprecated/python_oldbuffer.pxd

-# Present for backwards compatibility
-from cpython.oldbuffer cimport *

Cython/Includes/Deprecated/python_pycapsule.pxd

-# Present for backwards compatibility
-from cpython.pycapsule cimport *

Cython/Includes/Deprecated/python_ref.pxd

-# Present for backwards compatibility
-from cpython.ref cimport *

Cython/Includes/Deprecated/python_sequence.pxd

-# Present for backwards compatibility
-from cpython.sequence cimport *

Cython/Includes/Deprecated/python_set.pxd

-# Present for backwards compatibility
-from cpython.set cimport *

Cython/Includes/Deprecated/python_string.pxd

-# Present for backwards compatibility
-from cpython.string cimport *

Cython/Includes/Deprecated/python_tuple.pxd

-# Present for backwards compatibility
-from cpython.tuple cimport *

Cython/Includes/Deprecated/python_type.pxd

-# Present for backwards compatibility
-from cpython.type cimport *

Cython/Includes/Deprecated/python_unicode.pxd

-# Present for backwards compatibility
-from cpython.unicode cimport *

Cython/Includes/Deprecated/python_version.pxd

-# Present for backwards compatibility
-from cpython.version cimport *

Cython/Includes/Deprecated/python_weakref.pxd

-# Present for backwards compatibility
-from cpython.weakref cimport *

Cython/Includes/Deprecated/stdio.pxd

-# Present for backwards compatibility
-from libc.stdio cimport *

Cython/Includes/Deprecated/stdlib.pxd

-# Present for backwards compatibility
-from libc.stdlib cimport *

Cython/Includes/Deprecated/stl.pxd

-cdef extern from "<vector>" namespace std:
-
-	cdef cppclass vector[TYPE]:
-		#constructors
-		__init__()
-		__init__(vector&)
-		__init__(int)
-		__init__(int, TYPE&)
-		__init__(iterator, iterator)
-		#operators
-		TYPE& __getitem__(int)
-		TYPE& __setitem__(int, TYPE&)
-		vector __new__(vector&)
-		bool __eq__(vector&, vector&)
-		bool __ne__(vector&, vector&)
-		bool __lt__(vector&, vector&)
-		bool __gt__(vector&, vector&)
-		bool __le__(vector&, vector&)
-		bool __ge__(vector&, vector&)
-		#others
-		void assign(int, TYPE)
-		#void assign(iterator, iterator)
-		TYPE& at(int)
-		TYPE& back()
-		iterator begin()
-		int capacity()
-		void clear()
-		bool empty()
-		iterator end()
-		iterator erase(iterator)
-		iterator erase(iterator, iterator)
-		TYPE& front()
-		iterator insert(iterator, TYPE&)
-		void insert(iterator, int, TYPE&)
-		void insert(iterator, iterator)
-		int max_size()
-		void pop_back()
-		void push_back(TYPE&)
-		iterator rbegin()
-		iterator rend()
-		void reserve(int)
-		void resize(int)
-		void resize(int, TYPE&) #void resize(size_type num, const TYPE& = TYPE())
-		int size()
-		void swap(container&)
-
-cdef extern from "<deque>" namespace std:
-
-	cdef cppclass deque[TYPE]:
-		#constructors
-		__init__()
-		__init__(deque&)
-		__init__(int)
-		__init__(int, TYPE&)
-		__init__(iterator, iterator)
-		#operators
-		TYPE& operator[]( size_type index );
-		const TYPE& operator[]( size_type index ) const;
-		deque __new__(deque&);
-		bool __eq__(deque&, deque&);
-		bool __ne__(deque&, deque&);
-		bool __lt__(deque&, deque&);
-		bool __gt__(deque&, deque&);
-		bool __le__(deque&, deque&);
-		bool __ge__(deque&, deque&);
-		#others
-		void assign(int, TYPE&)
-		void assign(iterator, iterator)
-		TYPE& at(int)
-		TYPE& back()
-		iterator begin()
-		void clear()
-		bool empty()
-		iterator end()
-		iterator erase(iterator)
-		iterator erase(iterator, iterator)
-		TYPE& front()
-		iterator insert(iterator, TYPE&)
-		void insert(iterator, int, TYPE&)
-		void insert(iterator, iterator, iterator)
-		int max_size()
-		void pop_back()
-		void pop_front()
-		void push_back(TYPE&)
-		void push_front(TYPE&)
-		iterator rbegin()
-		iterator rend()
-		void resize(int)
-		void resize(int, TYPE&)
-		int size()
-		void swap(container&)

setup.py

@@ -42,8 +42,7 @@ pxd_include_dirs = [
     directory for directory, dirs, files
     in os.walk(os.path.join('Cython', 'Includes'))
     if '__init__.pyx' in files or '__init__.pxd' in files
-    or directory == os.path.join('Cython', 'Includes')
-    or directory == os.path.join('Cython', 'Includes', 'Deprecated')]
+    or directory == os.path.join('Cython', 'Includes')]
 
 pxd_include_patterns = [
     p+'/*.pxd' for p in pxd_include_dirs ] + [