Renamed Py() to XLPy()

xlwings · Aug 25, 2023 · 95dfbbc · 95dfbbc
1 parent 366b08d
commit 95dfbbc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/xlwings/addin/Extensions.bas b/xlwings/addin/Extensions.bas
@@ -7,9 +7,9 @@ Function sql(query, ParamArray tables())
         argsArray(2 + K - LBound(tables)) = tables(K)
         Next K
         If has_dynamic_array() Then
-            sql = Py.CallUDF("xlwings.ext", "sql_dynamic", argsArray, ActiveWorkbook, Application.Caller)
+            sql = XLPy.CallUDF("xlwings.ext", "sql_dynamic", argsArray, ActiveWorkbook, Application.Caller)
         Else
-            sql = Py.CallUDF("xlwings.ext", "sql", argsArray, ActiveWorkbook, Application.Caller)
+            sql = XLPy.CallUDF("xlwings.ext", "sql", argsArray, ActiveWorkbook, Application.Caller)
         End If
         Exit Function
 failed:

diff --git a/xlwings/addin/Main.bas b/xlwings/addin/Main.bas
@@ -120,11 +120,11 @@ Public Function RunPython(PythonCommand As String)
         ExecuteMac PythonCommand, interpreter, PYTHONPATH
     #Else
         If OPTIMIZED_CONNECTION = True Then
-            Py.SetAttr Py.Module("xlwings._xlwindows"), "BOOK_CALLER", ActiveWorkbook
+            XLPy.SetAttr XLPy.Module("xlwings._xlwindows"), "BOOK_CALLER", ActiveWorkbook
 
             On Error GoTo err_handling
 
-            Py.Exec "" & PythonCommand & ""
+            XLPy.Exec "" & PythonCommand & ""
             GoTo end_err_handling
 err_handling:
             ShowError "", Err.Description
@@ -479,9 +479,9 @@ Function NDims(ByRef src As Variant, dims As Long, Optional transpose As Boolean
     If 0 <> XLPyDLLNDims(src, dims, transpose, NDims) Then Err.Raise 1001, Description:=NDims
 End Function
 
-Function Py()
+Function XLPy()
     XLPyLoadDLL
-    If 0 <> XLPyDLLActivateAuto(Py, XLPyCommand, 1) Then Err.Raise 1000, Description:=Py
+    If 0 <> XLPyDLLActivateAuto(XLPy, XLPyCommand, 1) Then Err.Raise 1000, Description:=XLPy
 End Function
 
 Sub KillPy()
@@ -506,7 +506,7 @@ Sub ImportPythonUDFsBase(Optional addin As Boolean = False)
     End If
 
     On Error GoTo ImportError
-        tempPath = Py.Str(Py.Call(Py.Module("xlwings"), "import_udfs", Py.Tuple(GetUdfModules(wb), wb)))
+        tempPath = XLPy.Str(XLPy.Call(XLPy.Module("xlwings"), "import_udfs", XLPy.Tuple(GetUdfModules(wb), wb)))
     Exit Sub
 ImportError:
     errorMsg = Err.Description & " " & Err.Number

diff --git a/xlwings/addin/RibbonXlwings.bas b/xlwings/addin/RibbonXlwings.bas
@@ -235,6 +235,6 @@ Sub RestartPython(control As IRibbonControl)
     #If Mac Then
     #Else
     KillPy
-    Py.Exec ""
+    XLPy.Exec ""
     #End If
 End Sub
diff --git a/xlwings/addin/xlwings.xlam b/xlwings/addin/xlwings.xlam
diff --git a/xlwings/udfs.py b/xlwings/udfs.py
@@ -661,7 +661,7 @@ def generate_vba_wrapper(module_name, module, f, xl_workbook):
                 if ftype == "Sub":
                     with vba.block('#If App = "Microsoft Excel" Then'):
                         vba.writeln(
-                            'Py.CallUDF "{module_name}", "{fname}", '
+                            'XLPy.CallUDF "{module_name}", "{fname}", '
                             "{args_vba}, {vba_workbook}, Application.Caller",
                             module_name=module_name,
                             fname=fname,
@@ -670,7 +670,7 @@ def generate_vba_wrapper(module_name, module, f, xl_workbook):
                         )
                     with vba.block("#Else"):
                         vba.writeln(
-                            'Py.CallUDF "{module_name}", "{fname}", {args_vba}',
+                            'XLPy.CallUDF "{module_name}", "{fname}", {args_vba}',
                             module_name=module_name,
                             fname=fname,
                             args_vba=args_vba,
@@ -683,7 +683,7 @@ def generate_vba_wrapper(module_name, module, f, xl_workbook):
                             "On Error GoTo failed"
                         )
                         vba.writeln(
-                            '{fname} = Py.CallUDF("{module_name}", "{fname}", '
+                            '{fname} = XLPy.CallUDF("{module_name}", "{fname}", '
                             "{args_vba}, {vba_workbook}, Application.Caller)",
                             module_name=module_name,
                             fname=fname,
@@ -693,7 +693,7 @@ def generate_vba_wrapper(module_name, module, f, xl_workbook):
                         vba.writeln("Exit " + ftype)
                     with vba.block("#Else"):
                         vba.writeln(
-                            '{fname} = Py.CallUDF("{module_name}", '
+                            '{fname} = XLPy.CallUDF("{module_name}", '
                             '"{fname}", {args_vba})',
                             module_name=module_name,
                             fname=fname,