use-statements-part3 (#45)

rinarakaki · Nov 1, 2023 · 66310b8 · 66310b8
1 parent d1c2e1d
commit 66310b8
Show file tree

Hide file tree

Showing 110 changed files with 383 additions and 416 deletions.
diff --git a/Cython/Compiler/Code.pxd b/Cython/Compiler/Code.pxd
@@ -1,7 +1,7 @@
 # cython: language_level=3
 
 use cython
-from ..StringIOTree cimport StringIOTree
+use super::super::StringIOTree::StringIOTree
 
 cdef class UtilityCodeBase(object):
     cpdef format_code(self, code_string, replace_empty_lines=*)

diff --git a/Cython/Compiler/FlowControl.pxd b/Cython/Compiler/FlowControl.pxd
@@ -2,7 +2,7 @@
 
 use cython
 
-from .Visitor cimport CythonTransform, TreeVisitor
+use super::Visitor::(CythonTransform, TreeVisitor)
 
 cdef class ControlBlock:
     pub set children

diff --git a/Cython/Compiler/ParseTreeTransforms.pxd b/Cython/Compiler/ParseTreeTransforms.pxd
@@ -2,9 +2,10 @@
 
 use cython
 
-from .Visitor cimport (
+use super::Visitor::(
     CythonTransform, VisitorTransform, TreeVisitor,
-    ScopeTrackingTransform, EnvTransform)
+    ScopeTrackingTransform, EnvTransform
+)
 
 # Don't include mixins, only the main classes.
 #cdef class SkipDeclarations:

diff --git a/Cython/Compiler/Parsing.pxd b/Cython/Compiler/Parsing.pxd
@@ -5,7 +5,7 @@
 from __future__ import absolute_import
 
 use cython
-from .Scanning cimport PyrexScanner
+use super::Scanning::PyrexScanner
 
 ctypedef object (*p_sub_expr_func)(PyrexScanner obj)
 

diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
@@ -1758,12 +1758,12 @@ def p_use_statement(s):
         items.append(p_path(s, as_allowed=1))
     stats = []
     is_absolute = Future.absolute_import in s.context.future_directives
-    for pos, path, idents in items:
-        if path:
+    for pos, path, idents, level in items:
+        if len(path) > 0 or level > 0:
             stat = Nodes.FromCImportStatNode(
                 pos,
                 module_name=s.context.intern_ustring(".".join(path)),
-                relative_level=0,
+                relative_level=level,
                 imported_names=idents,
             )
         else:
@@ -1899,6 +1899,11 @@ def p_imported_name(s):
 
 def p_path(s, as_allowed):
     pos = s.position()
+    level = 0
+    while s.sy == "IDENT" and s.systring == "super":
+        level += 1
+        s.next()
+        s.expect("::")
     path = [p_ident(s)]
     idents = []
     while s.sy == "::":
@@ -1920,7 +1925,7 @@ def p_path(s, as_allowed):
             path.append(p_ident(s))
     if len(idents) == 0:
         path, idents = path[:-1], [(s.position(), path[-1], p_as_name(s))]
-    return (pos, path, idents)
+    return (pos, path, idents, level)
 
 
 def p_dotted_name(s, as_allowed):

diff --git a/Cython/Compiler/Scanning.pxd b/Cython/Compiler/Scanning.pxd
@@ -2,7 +2,7 @@
 
 import cython
 
-from ..Plex.Scanners cimport Scanner
+use super::super::Plex::Scanners::Scanner
 
 cdef unicode any_string_prefix, IDENT
 

diff --git a/Cython/Includes/cpython/bytearray.pxd b/Cython/Includes/cpython/bytearray.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     fn bint PyByteArray_Check(object o)

diff --git a/Cython/Includes/cpython/bytes.pxd b/Cython/Includes/cpython/bytes.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     struct va_list

diff --git a/Cython/Includes/cpython/cellobject.pxd b/Cython/Includes/cpython/cellobject.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
 

diff --git a/Cython/Includes/cpython/conversion.pxd b/Cython/Includes/cpython/conversion.pxd
@@ -1,6 +1,6 @@
 # From https://docs.python.org/3/c-api/conversion.html
 
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     struct va_list

diff --git a/Cython/Includes/cpython/descr.pxd b/Cython/Includes/cpython/descr.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject, PyTypeObject
+use super::object::(PyObject, PyTypeObject)
 
 extern from "Python.h":
     ctypedef object (*wrapperfunc)(self, args, void* wrapped)

diff --git a/Cython/Includes/cpython/dict.pxd b/Cython/Includes/cpython/dict.pxd
@@ -1,5 +1,5 @@
-from .object cimport PyObject
-from .pyport cimport uint64_t
+use super::object::PyObject
+use super::pyport::uint64_t
 
 extern from "Python.h":
     # On Python 2, PyDict_GetItemWithError is called _PyDict_GetItemWithError

diff --git a/Cython/Includes/cpython/exc.pxd b/Cython/Includes/cpython/exc.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     #####################################################################

diff --git a/Cython/Includes/cpython/function.pxd b/Cython/Includes/cpython/function.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     ############################################################################

diff --git a/Cython/Includes/cpython/genobject.pxd b/Cython/Includes/cpython/genobject.pxd
@@ -1,4 +1,4 @@
-from .pystate cimport PyFrameObject
+use super::pystate::PyFrameObject
 
 extern from "Python.h":
     ###########################################################################

diff --git a/Cython/Includes/cpython/list.pxd b/Cython/Includes/cpython/list.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     ############################################################################

diff --git a/Cython/Includes/cpython/method.pxd b/Cython/Includes/cpython/method.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     ############################################################################

diff --git a/Cython/Includes/cpython/module.pxd b/Cython/Includes/cpython/module.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     struct _inittab

diff --git a/Cython/Includes/cpython/number.pxd b/Cython/Includes/cpython/number.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     #####################################################################

diff --git a/Cython/Includes/cpython/pylifecycle.pxd b/Cython/Includes/cpython/pylifecycle.pxd
@@ -1,7 +1,7 @@
 # Interfaces to configure, query, create & destroy the Python runtime
 
 use libc::stdio::FILE
-from .pystate cimport PyThreadState
+use super::pystate::PyThreadState
 
 extern from "Python.h":
     ctypedef i32 wchar_t

diff --git a/Cython/Includes/cpython/pystate.pxd b/Cython/Includes/cpython/pystate.pxd
@@ -1,6 +1,6 @@
 # Thread and interpreter state structures and their interfaces
 
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     # We make these an opaque types. If the user wants specific attributes,

diff --git a/Cython/Includes/cpython/ref.pxd b/Cython/Includes/cpython/ref.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject, PyTypeObject, Py_TYPE  # legacy imports for re-export
+use super::object::(PyObject, PyTypeObject, Py_TYPE)  # legacy imports for re-export
 
 extern from "Python.h":
     #####################################################################

diff --git a/Cython/Includes/cpython/sequence.pxd b/Cython/Includes/cpython/sequence.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     ############################################################################

diff --git a/Cython/Includes/cpython/string.pxd b/Cython/Includes/cpython/string.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     struct va_list

diff --git a/Cython/Includes/cpython/time.pxd b/Cython/Includes/cpython/time.pxd
@@ -10,7 +10,7 @@ extern from "Python.h":
     _PyTime_t _PyTime_GetSystemClock() nogil
     fn f64 _PyTime_AsSecondsDouble(_PyTime_t t) nogil
 
-from libc.time cimport (
+use libc::time::(
     tm,
     time_t,
     localtime as libc_localtime,

diff --git a/Cython/Includes/cpython/tuple.pxd b/Cython/Includes/cpython/tuple.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     ############################################################################

diff --git a/Cython/Includes/cpython/weakref.pxd b/Cython/Includes/cpython/weakref.pxd
@@ -1,4 +1,4 @@
-from .object cimport PyObject
+use super::object::PyObject
 
 extern from "Python.h":
     fn bint PyWeakref_Check(object ob)

diff --git a/Cython/Includes/libcpp/map.pxd b/Cython/Includes/libcpp/map.pxd
@@ -1,4 +1,4 @@
-from .utility cimport pair
+use super::utility::pair
 
 extern from "<map>" namespace "std" nogil:
     cdef cppclass map[T, U, COMPARE=*, ALLOCATOR=*]:

diff --git a/Cython/Includes/libcpp/memory.pxd b/Cython/Includes/libcpp/memory.pxd
@@ -1,4 +1,4 @@
-from libcpp cimport bool, nullptr_t, nullptr
+use libcpp::(bool, nullptr_t, nullptr)
 
 extern from "<memory>" namespace "std" nogil:
     cdef cppclass default_delete[T]:

diff --git a/Cython/Includes/libcpp/pair.pxd b/Cython/Includes/libcpp/pair.pxd
@@ -1 +1 @@
-from .utility cimport pair
+use super::utility::pair
diff --git a/Cython/Includes/libcpp/set.pxd b/Cython/Includes/libcpp/set.pxd
@@ -1,4 +1,4 @@
-from .utility cimport pair
+use super::utility::pair
 
 extern from "<set>" namespace "std" nogil:
     cdef cppclass set[T]:

diff --git a/Cython/Includes/libcpp/typeindex.pxd b/Cython/Includes/libcpp/typeindex.pxd
@@ -1,5 +1,5 @@
 use libcpp::bool
-from .typeinfo cimport type_info
+use super::typeinfo::type_info
 
 # This class is C++11-only
 extern from "<typeindex>" namespace "std" nogil:

diff --git a/Cython/Includes/libcpp/unordered_map.pxd b/Cython/Includes/libcpp/unordered_map.pxd
@@ -1,4 +1,4 @@
-from .utility cimport pair
+use super::utility::pair
 
 extern from "<unordered_map>" namespace "std" nogil:
     cdef cppclass unordered_map[T, U, HASH=*, PRED=*, ALLOCATOR=*]:

diff --git a/Cython/Includes/libcpp/unordered_set.pxd b/Cython/Includes/libcpp/unordered_set.pxd
@@ -1,4 +1,4 @@
-from .utility cimport pair
+use super::utility::pair
 
 extern from "<unordered_set>" namespace "std" nogil:
     cdef cppclass unordered_set[T,HASH=*,PRED=*,ALLOCATOR=*]:

diff --git a/Cython/Includes/posix/select.pxd b/Cython/Includes/posix/select.pxd
@@ -1,7 +1,7 @@
 # https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_select.h.html
 
-from .types cimport sigset_t
-from .time cimport timeval, timespec
+use super::time::(timeval, timespec)
+use super::types::sigset_t
 
 extern from "<sys/select.h>" nogil:
     struct fd_set:

diff --git a/Cython/Includes/posix/stat.pxd b/Cython/Includes/posix/stat.pxd
@@ -1,10 +1,9 @@
 # https://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/stat.h.html
 # https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_stat.h.html
 
-from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
-                          nlink_t, off_t, time_t, uid_t)
 use posix::time::timespec
-
+use posix::types::(blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
+                   nlink_t, off_t, time_t, uid_t)
 
 extern from "<sys/stat.h>" nogil:
     struct struct_stat "stat":

diff --git a/Cython/Plex/DFA.pxd b/Cython/Plex/DFA.pxd
@@ -2,8 +2,8 @@
 
 use cython
 
-from . cimport Machines
-from .Transitions cimport TransitionMap
+use super::Machines
+use super::Transitions::TransitionMap
 
 
 #[cython.final]

diff --git a/Cython/Plex/Machines.pxd b/Cython/Plex/Machines.pxd
@@ -1,7 +1,7 @@
 use cython
 
-from .Actions cimport Action
-from .Transitions cimport TransitionMap
+use super::Actions::Action
+use super::Transitions::TransitionMap
 
 cdef i32 maxint
 

diff --git a/docs/examples/tutorial/cdef_classes/integrate.pyx b/docs/examples/tutorial/cdef_classes/integrate.pyx
@@ -1,4 +1,4 @@
-from sin_of_square cimport Function, SinOfSquareFunction
+use sin_of_square::(Function, SinOfSquareFunction)
 
 def integrate(Function f, f64 a, f64 b, i32 N):
     let i32 i

diff --git a/tests/broken/cimportfunc.pyx b/tests/broken/cimportfunc.pyx
@@ -1 +1 @@
-from cexportfunc cimport f, g
+use cexportfunc::(f, g)
diff --git a/tests/build/build_ext_cython_cplus.srctree b/tests/build/build_ext_cython_cplus.srctree
@@ -22,7 +22,7 @@ setup(
 
 ######## a.pyx ########
 
-from libcpp.vector cimport vector
+use libcpp::vector::vector
 
 def use_vector(L):
     try:

diff --git a/tests/build/cpp_cythonize.srctree b/tests/build/cpp_cythonize.srctree
@@ -17,7 +17,7 @@ setup(
 
 # distutils: language=c++
 
-from libcpp.vector cimport vector
+use libcpp::vector::vector
 
 def use_vector(L):
     try:

diff --git a/tests/build/cythonize_options.srctree b/tests/build/cythonize_options.srctree
@@ -19,11 +19,11 @@ old_stderr = sys.stderr
 captured = sys.stderr = StringIO()
 try:
     setup(
-      ext_modules = cythonize(
-          "*.pyx", include_path=['subdir'],
-          compiler_directives={'cdivision': True},
-          show_all_warnings=True,
-      ),
+        ext_modules = cythonize(
+            "*.pyx", include_path=['subdir'],
+            compiler_directives={'cdivision': True},
+            show_all_warnings=True,
+        ),
     )
     output = sys.stderr.getvalue()
 finally:
@@ -32,14 +32,13 @@ finally:
 
 assert "Unraisable exception in function" in output, output
 
-
 ######## subdir/x.pxd ########
 
 ######## subdir/y.pxi ########
 
 ######## a.pyx ########
 
-cimport x
+use x
 include "y.pxi"
 
 # cdivision from setup.py