Merge branch 'main' of https://github.com/mhammond/pywin32 into Native-ARM64-CI-wheels

Author: Avasam

.github/ISSUE_TEMPLATE/issue_template.md

@@ -1,6 +1,6 @@
 ---
 name: New issue
-about: Do not open github issues for general support requests
+about: Do not open GitHub issues for general support requests
 ---
 
 <!--

AutoDuck/pywin32-document.xml

@@ -1,6 +1,6 @@
 <document>
     <important>
-        <item name="View the change log" href="html/CHANGES.txt"/>
+        <item name="View the change log" href="html/CHANGES.md"/>
     </important>
     <links>
         <item name="Python Web Site" href="https://www.python.org"/>

AutoDuck/pywin32.mak

@@ -30,7 +30,7 @@ HTML_FILES = $(WIN32_HELP_DIR)\*.html \
 		$(WIN32COMEXT_DIR)/axscript/demos/client/ie/* \
 		$(ISAPI_DIR)/doc/*.html \
 		$(PYTHONWIN_DIR)/readme.html $(PYTHONWIN_DIR)/doc/* $(PYTHONWIN_DIR)/doc/debugger/* \
-		../CHANGES.txt \
+		../CHANGES.md \
 
 
 WIN32_SOURCE = $(WIN32_SOURCE_DIR)/*.cpp \

CHANGES.txt renamed to CHANGES.md

@@ -1,11 +1,11 @@
 This is a copy of Scintilla 4.4.6 used for Pythonwin.
 
-Scintilla's home is https://www.scintilla.org/
+Scintilla's home is <https://www.scintilla.org/>
 
 Only the sources relevant to Scintilla under Pythonwin are
-included (plus the Scintilla Licence.txt and README).
+included (plus the Scintilla `License.txt` and `README`).
 For the full set of Scintilla sources, including its documentation
-and companion editor SciTE, see https://www.scintilla.org/ .
+and companion editor SciTE, see <https://www.scintilla.org/>.
 
 When updating the Scintilla source, also update the copyright year
 in Pythonwin/pywin/framework/app.py and regenerate

Pythonwin/Scintilla/README_pythonwin renamed to Pythonwin/Scintilla/README_pythonwin.md

@@ -906,7 +906,7 @@ void SCI_METHOD LexerBaan::Fold(Sci_PositionU startPos, Sci_Position length, int
 		// Section Foldings.
 		// One way of implementing Section Foldings, as there is no END markings of sections.
 		// first section ends on the previous line of next section.
-		// Re-written whole folding to accomodate this.
+		// Re-written whole folding to accommodate this.
 		if (options.baanFoldSections && atEOL) {
 			currLineStyle = mainOrSubSectionLine(lineCurrent, styler);
 			nextLineStyle = mainOrSubSectionLine(lineCurrent + 1, styler);

Pythonwin/Scintilla/lexers/LexBaan.cxx

@@ -191,7 +191,7 @@ extern "C" __declspec(dllexport) int __stdcall DllMainwin32ui(HINSTANCE hInstanc
         // insert into resource chain.
         pDLL = new CDynLinkLibrary(extensionDLL);
 
-#else  // Frozen .EXE that embedds win32ui is initializing
+#else  // Frozen .EXE that embeds win32ui is initializing
         TRACE("win32ui in frozen %s initializing.\n", path);
 #endif
     }

Pythonwin/dllmain.cpp

@@ -287,7 +287,7 @@ def OnDropFiles(self, msg):
     # 		except:
     # 			# take copies of the exception values, else other (handled) exceptions may get
     # 			# copied over by the other fns called.
-    # 			win32ui.SetStatusText('An exception occured in a windows command handler.')
+    # 			win32ui.SetStatusText('An exception occurred in a windows command handler.')
     # 			t, v, tb = sys.exc_info()
     # 			traceback.print_exception(t, v, tb.tb_next)
     # 			try:
@@ -297,7 +297,7 @@ def OnDropFiles(self, msg):
 
     # Command handlers.
     def OnFileMRU(self, id, code):
-        "Called when a File 1-n message is recieved"
+        "Called when a File 1-n message is received"
         fileName = win32ui.GetRecentFileList()[id - win32ui.ID_FILE_MRU_FILE1]
         win32ui.GetApp().OpenDocumentFile(fileName)
 
@@ -354,7 +354,9 @@ def OnInitDialog(self):
         except OSError:
             ver = None
         if not ver:
-            warnings.warn(f"Could not read pywin32's version from '{version_path}'")
+            warnings.warn(
+                f"Could not read pywin32's version from '{version_path}'", stacklevel=1
+            )
         self.SetDlgItemText(win32ui.IDC_ABOUT_VERSION, ver)
         self.HookCommand(self.OnButHomePage, win32ui.IDC_BUTTON1)
 

Pythonwin/pywin/framework/app.py

@@ -105,7 +105,9 @@ def OnAdd(self, msg, code):
             ## for the toolbar button IDC_DBG_ADD fails, since MFC falls back to
             ## sending a normal command if the UI update command fails.
             ## win32ui.MessageBox('There is no active window - no breakpoint can be added')
-            warnings.warn("There is no active window - no breakpoint can be added")
+            warnings.warn(
+                "There is no active window - no breakpoint can be added", stacklevel=1
+            )
             return None
         pathName = doc.GetPathName()
         lineNo = view.LineFromChar(view.GetSel()[0]) + 1

Pythonwin/pywin/framework/dbgcommands.py

@@ -3,7 +3,7 @@ Pythonwin IDLE directory
 
 This directory contains IDLE extensions used by
 Pythonwin.  The files in this directory that also appear in the main IDLE
-directory are intended be indentical to the latest available for IDLE.
+directory are intended be identical to the latest available for IDLE.
 
 If you use IDLE from the CVS sources, then the files should be
 identical.  If you have a Python version installed that is more recent