Skip to content

Commit 113b31b

Browse files
committed
Comment only changes from mhammond#2413
1 parent 25e01da commit 113b31b

File tree

6 files changed

+8
-21
lines changed

6 files changed

+8
-21
lines changed

Pythonwin/win32cmdui.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@ inline void *GetPythonOleProcAddress(const char *procName)
2727
#endif
2828
hMod = GetModuleHandle(buf);
2929

30-
// XXX It is unclear why the code previously tried to identify a loaded PythonCOM DLL of
31-
// any Python version 1.5 .. 3.9. If some InprocServer would load the DLL of a different
32-
// Python version that would likely cause a crash. Thus deactivated.
33-
//
34-
// for (int i = 0; hMod == NULL && i < 40; i++) {
35-
// #ifdef _DEBUG
36-
// wsprintf(buf, _T("PythonCOM3%d_d.dll"), i);
37-
// #else
38-
// wsprintf(buf, _T("PythonCOM3%d.dll"), i);
39-
// #endif
40-
// hMod = GetModuleHandle(buf);
41-
// }
42-
4330
if (hMod) {
4431
void *rc = GetProcAddress(hMod, procName);
4532
if (rc == NULL)
@@ -82,8 +69,8 @@ BOOL Python_OnCmdMsg(CCmdTarget *obj, UINT nID, int nCode, void *pExtra, AFX_CMD
8269
pObj->pOleEventHookList->Lookup((unsigned short)pEvent->m_dispid, (void *&)method)) {
8370
if (pfnMakeOlePythonCall == NULL) {
8471
pfnMakeOlePythonCall =
85-
(BOOL(*)(PyObject *, DISPPARAMS FAR *, VARIANT FAR *, EXCEPINFO FAR *, UINT FAR *,
86-
PyObject *))GetPythonOleProcAddress("PyCom_MakeOlePythonCall");
72+
(BOOL (*)(PyObject *, DISPPARAMS FAR *, VARIANT FAR *, EXCEPINFO FAR *, UINT FAR *,
73+
PyObject *))GetPythonOleProcAddress("PyCom_MakeOlePythonCall");
8774

8875
ASSERT(pfnMakeOlePythonCall);
8976
}

Pythonwin/win32uimodule.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,9 +2559,9 @@ extern "C" PYW_EXPORT BOOL Win32uiApplicationInit(Win32uiHostGlue *pGlue, const
25592559
PyObject *argv = PySys_GetObject("argv");
25602560
PyInit_win32ui();
25612561
// Decide if we render sys.argv from command line.
2562-
// PY3.6- Py_Initialize sets sys.argv=NULL .
2563-
// PY3.7 Py_Initialize or intentional script triggers set sys.argv=[] .
2564-
// PY3.8+ Py_Initialize sets sys.argv=[''] - cannot be distinguished
2562+
// Python 3.6- Py_Initialize sets sys.argv=NULL .
2563+
// Python 3.7 Py_Initialize or intentional script triggers set sys.argv=[] .
2564+
// Python 3.8+ Py_Initialize sets sys.argv=[''] - cannot be distinguished
25652565
// from a pre-existing command line setup anymore. So we need to check
25662566
// another flag regarding the intended type of invokation, e.g. `cmd`
25672567
// (or untangle all that crossover startup + module + app init here)

build_env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This describes how to setup the build environment for pywin32.
55
Double check the compiler version you need in the [Python wiki](https://wiki.python.org/moin/WindowsCompilers)
66
but note that Python 3.5 -> 3.13 all use version 14.X of the compiler, which,
77
confusingly, report themselves as V.19XX (eg, note in Python's banner,
8-
3.5's "MSC v.1900", even 3.9b4's "MSC v.1924")
8+
3.5's "MSC v.1900", even 3.13's "MSC v.1941")
99

1010
This compiler first shipped with Visual Studio 2015, although Visual Studio
1111
2017, 2019 and 2022 all have this compiler available, just not installed

com/win32com/client/gencache.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def _LoadDicts():
9999
arc_path = loader.archive
100100
dicts_path = os.path.join(win32com.__gen_path__, "dicts.dat")
101101
if dicts_path.startswith(arc_path):
102+
# Remove the leading slash as well
102103
dicts_path = dicts_path[len(arc_path) + 1 :]
103104
else:
104105
# Hm. See below.

pyrightconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"enableTypeIgnoreComments": true,
77
// Exclude from scanning when running pyright
88
"exclude": [
9-
".git/",
9+
".git/", // Avoids scanning git branch names ending in ".py"
1010
"build/",
1111
// Vendored
1212
"Pythonwin/Scintilla/",

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,6 @@ def link(
901901
# update.
902902
args = [
903903
sys.executable,
904-
# NOTE: On Python 3.7, all args must be str
905904
str(Path(__file__).parent / "win32" / "Lib" / "win32verstamp.py"),
906905
f"--version={pywin32_version}",
907906
"--comments=https://github.com/mhammond/pywin32",

0 commit comments

Comments
 (0)