Implement a stand-alone Python class with your functionality
This is obviously a very simple server. In particular, custom error handling would be needed for a production class server. In addition, there are some contrived properties just for demonstration purposes.
Make Unicode concessions
-At this stage, Python and Unicode don’t really work well together. All strings which come from COM will actually be Unicode objects rather than string objects.
+At this stage, Python and Unicode don’t really work well together. All strings which come from COM will actually be Unicode objects rather than string objects.
To make this code work in a COM environment, the last line of the "Hello" method must become:
@@ -85,7 +85,7 @@ Annotate the class with win32com specific attributes
_public_attrs_ = ['softspace', 'noCalls']
_readonly_attrs_ = ['noCalls']
def __init__(self):
-[Same from here…]
+[Same from here…]
@@ -93,7 +93,7 @@ Annotate the class with win32com specific attributes
Generating the CLSID
Microsoft Visual C++ comes with various tools for generating CLSID's, which are quite suitable. Alternatively, the pythoncom module exports the function CreateGuid() to generate these identifiers.
>>> import pythoncom
->>> print pythoncom.CreateGuid()
+>>> print(pythoncom.CreateGuid())
{7CC9F362-486D-11D1-BB48-0000E838A65F}
Obviously the GUID that you get will be different than that displayed here.
Preparing for registration of the Class
@@ -179,13 +179,13 @@
Default Policy attributes
The default policy object has a few special attributes that define who the object is exposed to COM. The example above shows the _public_methods attribute, but this section describes all such attributes in detail.
_public_methods_
-Required list of strings, containing the names of all methods to be exposed to COM. It is possible this will be enhanced in the future (eg, possibly '*' will be recognised to say all methods, or some other ideas…)
+Required list of strings, containing the names of all methods to be exposed to COM. It is possible this will be enhanced in the future (eg, possibly '*' will be recognised to say all methods, or some other ideas…)
_public_attrs_
Optional list of strings containing all attribute names to be exposed, both for reading and writing. The attribute names must be valid instance variables.
_readonly_attrs_
Optional list of strings defining the name of attributes exposed read-only.
_com_interfaces_
-Optional list of IIDs exposed by this object. If this attribute is missing, IID_IDispatch is assumed (ie, if not supplied, the COM object will be created as a normal Automation object.
+Optional list of IIDs exposed by this object. If this attribute is missing, IID_IDispatch is assumed (ie, if not supplied, the COM object will be created as a normal Automation object).
and actual instance attributes:
_dynamic_ : optional method
_value_ : optional attribute
diff --git a/com/win32com/client/CLSIDToClass.py b/com/win32com/client/CLSIDToClass.py
index fde3274332..88b742e0ac 100644
--- a/com/win32com/client/CLSIDToClass.py
+++ b/com/win32com/client/CLSIDToClass.py
@@ -16,6 +16,7 @@
This obviously applies to all cooperating objects, not just DAO and
Access.
"""
+
mapCLSIDToClass = {}
diff --git a/com/win32com/client/__init__.py b/com/win32com/client/__init__.py
index 6f8ad07088..36f2c1d778 100644
--- a/com/win32com/client/__init__.py
+++ b/com/win32com/client/__init__.py
@@ -303,7 +303,7 @@ class object that derives from three classes:
>>> class IEEvents:
... def OnVisible(self, visible):
- ... print "Visible changed:", visible
+ ... print("Visible changed:", visible)
...
>>> ie = DispatchWithEvents("InternetExplorer.Application", IEEvents)
>>> ie.Visible = 1
@@ -358,7 +358,7 @@ def WithEvents(disp, user_event_class):
>>> class IEEvents:
... def OnVisible(self, visible):
- ... print "Visible changed:", visible
+ ... print("Visible changed:", visible)
...
>>> ie = Dispatch("InternetExplorer.Application")
>>> ie_events = WithEvents(ie, IEEvents)
@@ -437,7 +437,7 @@ def getevents(clsid):
>>>
>>> class InternetExplorerEvents(win32com.client.getevents("InternetExplorer.Application.1")):
... def OnVisible(self, Visible):
- ... print "Visibility changed: ", Visible
+ ... print("Visibility changed: ", Visible)
...
>>>
>>> ie=win32com.client.Dispatch("InternetExplorer.Application.1")
diff --git a/com/win32com/client/build.py b/com/win32com/client/build.py
index 1035ecdff9..8318b88949 100644
--- a/com/win32com/client/build.py
+++ b/com/win32com/client/build.py
@@ -69,9 +69,7 @@ class NotSupportedException(Exception):
pythoncom.VT_VOID,
]
-NoTranslateMap = {}
-for v in NoTranslateTypes:
- NoTranslateMap[v] = None
+NoTranslateMap = set(NoTranslateTypes)
class MapEntry:
diff --git a/com/win32com/client/combrowse.py b/com/win32com/client/combrowse.py
index 18576251ee..a5e76a85ba 100644
--- a/com/win32com/client/combrowse.py
+++ b/com/win32com/client/combrowse.py
@@ -22,6 +22,7 @@
work.
"""
+
import sys
import pythoncom
diff --git a/com/win32com/client/connect.py b/com/win32com/client/connect.py
index 24788204ec..7cb3969464 100644
--- a/com/win32com/client/connect.py
+++ b/com/win32com/client/connect.py
@@ -1,4 +1,5 @@
"""Utilities for working with Connections"""
+
import pythoncom
import win32com.server.util
diff --git a/com/win32com/client/dynamic.py b/com/win32com/client/dynamic.py
index dc938e8cbe..51d4702f8a 100644
--- a/com/win32com/client/dynamic.py
+++ b/com/win32com/client/dynamic.py
@@ -15,6 +15,7 @@
>>> xl.Visible = 1 # The Excel window becomes visible.
"""
+
import traceback
import types
@@ -234,7 +235,7 @@ def __repr__(self):
return "" % (self._username_)
def __str__(self):
- # __str__ is used when the user does "print object", so we gracefully
+ # __str__ is used when the user does "print(object)", so we gracefully
# fall back to the __repr__ if the object has no default method.
try:
return str(self.__call__())
@@ -330,7 +331,7 @@ def __getitem__(self, index): # syver modified
def __setitem__(self, index, *args):
# XXX - todo - We should support calling Item() here too!
- # print "__setitem__ with", index, args
+ # print("__setitem__ with", index, args)
if self._olerepr_.defaultDispatchName:
invkind, dispid = self._find_dispatch_type_(
self._olerepr_.defaultDispatchName
@@ -414,8 +415,8 @@ def _make_method_(self, name):
)
methodCode = "\n".join(methodCodeList)
try:
- # print "Method code for %s is:\n" % self._username_, methodCode
- # self._print_details_()
+ # print(f"Method code for {self._username_} is:\n", methodCode)
+ # self._print_details_()
codeObject = compile(methodCode, "" % self._username_, "exec")
# Exec the code object
tempNameSpace = {}
diff --git a/com/win32com/client/gencache.py b/com/win32com/client/gencache.py
index debe796213..cc23afdf7d 100644
--- a/com/win32com/client/gencache.py
+++ b/com/win32com/client/gencache.py
@@ -20,6 +20,7 @@
Currently just uses a pickled dictionary, but should used some sort of indexed file.
Maybe an OLE2 compound file, or a bsddb file?
"""
+
import glob
import os
import sys
@@ -458,7 +459,7 @@ def EnsureModule(
# If we get an ImportError
# We may still find a valid cache file under a different MinorVersion #
# (which windows will search out for us)
- # print "Loading reg typelib", typelibCLSID, major, minor, lcid
+ # print("Loading reg typelib", typelibCLSID, major, minor, lcid)
module = None
try:
tlbAttr = pythoncom.LoadRegTypeLib(
@@ -467,7 +468,7 @@ def EnsureModule(
# if the above line doesn't throw a pythoncom.com_error, check if
# it is actually a different lib than we requested, and if so, suck it in
if tlbAttr[1] != lcid or tlbAttr[4] != minor:
- # print "Trying 2nd minor #", tlbAttr[1], tlbAttr[3], tlbAttr[4]
+ # print("Trying 2nd minor #", tlbAttr[1], tlbAttr[3], tlbAttr[4])
try:
module = GetModuleForTypelib(
typelibCLSID, tlbAttr[1], tlbAttr[3], tlbAttr[4]
@@ -525,7 +526,7 @@ def EnsureModule(
module.MinorVersion != tlbAttributes[4]
or genpy.makepy_version != module.makepy_version
):
- # print "Version skew: %d, %d" % (module.MinorVersion, tlbAttributes[4])
+ # print(f"Version skew: {module.MinorVersion}, {tlbAttributes[4]}")
# try to erase the bad file from the cache
try:
os.unlink(filePath)
@@ -550,21 +551,21 @@ def EnsureModule(
)
filePath = filePathPrefix + ".py"
filePathPyc = filePathPrefix + ".pyc"
- # print "Trying py stat: ", filePath
+ # print("Trying py stat: ", filePath)
fModTimeSet = 0
try:
pyModTime = os.stat(filePath)[8]
fModTimeSet = 1
except OSError as e:
# If .py file fails, try .pyc file
- # print "Trying pyc stat", filePathPyc
+ # print("Trying pyc stat", filePathPyc)
try:
pyModTime = os.stat(filePathPyc)[8]
fModTimeSet = 1
except OSError as e:
pass
- # print "Trying stat typelib", pyModTime
- # print str(typLibPath)
+ # print("Trying stat typelib", pyModTime)
+ # print(typLibPath)
typLibModTime = os.stat(typLibPath)[8]
if fModTimeSet and (typLibModTime > pyModTime):
bReloadNeeded = 1
@@ -598,7 +599,7 @@ def EnsureModule(
# remember and return
versionRedirectMap[key] = ret
return ret
- # print "Rebuilding: ", major, minor
+ # print("Rebuilding: ", major, minor)
module = MakeModuleForTypelib(
typelibCLSID,
lcid,
@@ -768,12 +769,12 @@ def _Dump():
def usage():
usageString = """\
- Usage: gencache [-q] [-d] [-r]
+ Usage: gencache [-q] [-d] [-r]
- -q - Quiet
- -d - Dump the cache (typelibrary description and filename).
- -r - Rebuild the cache dictionary from the existing .py files
- """
+ -q - Quiet
+ -d - Dump the cache (typelibrary description and filename).
+ -r - Rebuild the cache dictionary from the existing .py files
+ """
print(usageString)
sys.exit(1)
diff --git a/com/win32com/client/genpy.py b/com/win32com/client/genpy.py
index 06f11889cd..d23cd3079f 100644
--- a/com/win32com/client/genpy.py
+++ b/com/win32com/client/genpy.py
@@ -207,10 +207,10 @@ def __init__(self, typeinfo, attr, doc=None, bForUser=1):
name = typeinfo.GetNames(vdesc[0])[0]
self.mapVars[name] = build.MapEntry(vdesc)
- ## def WriteEnumerationHeaders(self, aliasItems, stream):
- ## enumName = self.doc[0]
- ## print >> stream "%s=constants # Compatibility with previous versions." % (enumName)
- ## WriteAliasesForItem(self, aliasItems)
+ # def WriteEnumerationHeaders(self, aliasItems, stream):
+ # enumName = self.doc[0]
+ # print(f"{enumName}=constants # Compatibility with previous versions.", file=stream)
+ # WriteAliasesForItem(self, aliasItems)
def WriteEnumerationItems(self, stream):
num = 0
diff --git a/com/win32com/client/util.py b/com/win32com/client/util.py
index 1925843ab3..33f5763367 100644
--- a/com/win32com/client/util.py
+++ b/com/win32com/client/util.py
@@ -3,6 +3,7 @@
This module contains utility functions, used primarily by advanced COM
programmers, or other COM modules.
"""
+
import pythoncom
from win32com.client import Dispatch, _get_good_object_
diff --git a/com/win32com/makegw/makegw.py b/com/win32com/makegw/makegw.py
index 196fce4276..92e3354628 100644
--- a/com/win32com/makegw/makegw.py
+++ b/com/win32com/makegw/makegw.py
@@ -144,11 +144,11 @@ def _write_ifc_h(f, interface):
class Py{interface.name} : public Py{interface.base}
{{
public:
- MAKE_PYCOM_CTOR(Py{interface.name});
- static {interface.name} *GetI(PyObject *self);
- static PyComTypeObject type;
+ MAKE_PYCOM_CTOR(Py{interface.name});
+ static {interface.name} *GetI(PyObject *self);
+ static PyComTypeObject type;
- // The Python methods
+ // The Python methods
"""
)
for method in interface.methods:
@@ -159,8 +159,8 @@ class Py{interface.name} : public Py{interface.base}
f"""\
protected:
- Py{interface.name}(IUnknown *pdisp);
- ~Py{interface.name}();
+ Py{interface.name}(IUnknown *pdisp);
+ ~Py{interface.name}();
}};
"""
)
@@ -175,9 +175,9 @@ def _write_ifc_cpp(f, interface):
// Interface Implementation
Py{name}::Py{name}(IUnknown *pdisp):
- Py{base}(pdisp)
+ Py{base}(pdisp)
{{
- ob_type = &type;
+ ob_type = &type;
}}
Py{name}::~Py{name}()
@@ -186,7 +186,7 @@ def _write_ifc_cpp(f, interface):
/* static */ {name} *Py{name}::GetI(PyObject *self)
{{
- return ({name} *)Py{base}::GetI(self);
+ return ({name} *)Py{base}::GetI(self);
}}
""".format(
@@ -203,18 +203,16 @@ def _write_ifc_cpp(f, interface):
// @pymethod |Py{interfacename}|{method}|Description of {method}.
PyObject *Py{interfacename}::{method}(PyObject *self, PyObject *args)
{{
- {interfacename} *p{ptr} = GetI(self);
- if ( p{ptr} == NULL )
- return NULL;
+ {interfacename} *p{ptr} = GetI(self);
+ if ( p{ptr} == NULL )
+ return NULL;
""".format(
**strdict
)
)
- argsParseTuple = (
- argsCOM
- ) = (
- formatChars
- ) = codePost = codePobjects = codeCobjects = cleanup = cleanup_gil = ""
+ argsParseTuple = argsCOM = formatChars = codePost = codePobjects = (
+ codeCobjects
+ ) = cleanup = cleanup_gil = ""
needConversion = 0
# if method.name=="Stat": import win32dbg;win32dbg.brk()
for arg in method.args:
@@ -282,14 +280,14 @@ def _write_ifc_cpp(f, interface):
strdict["cleanup"] = cleanup
strdict["cleanup_gil"] = cleanup_gil
f.write(
- """ HRESULT hr;
- PY_INTERFACE_PRECALL;
- hr = p{ptr}->{method}({argsCOM} );
+ """ HRESULT hr;
+ PY_INTERFACE_PRECALL;
+ hr = p{ptr}->{method}({argsCOM} );
{cleanup}
- PY_INTERFACE_POSTCALL;
+ PY_INTERFACE_POSTCALL;
{cleanup_gil}
- if ( FAILED(hr) )
- return PyCom_BuildPyException(hr, p{ptr}, IID_{interfacename} );
+ if ( FAILED(hr) )
+ return PyCom_BuildPyException(hr, p{ptr}, IID_{interfacename} );
""".format(
**strdict
)
@@ -336,14 +334,14 @@ def _write_ifc_cpp(f, interface):
interfacebase = interface.base
f.write(
"""\
- {{ NULL }}
+ {{ NULL }}
}};
PyComTypeObject Py{name}::type("Py{name}",
- &Py{interfacebase}::type,
- sizeof(Py{name}),
- Py{name}_methods,
- GET_PYCOM_CTOR(Py{name}));
+ &Py{interfacebase}::type,
+ sizeof(Py{name}),
+ Py{name}_methods,
+ GET_PYCOM_CTOR(Py{name}));
""".format(
**locals()
)
@@ -372,8 +370,8 @@ def _write_gw_h(f, interface):
class {gname} : public {base_name}, public {name}
{{
protected:
- {gname}(PyObject *instance) : {base_name}(instance) {{ ; }}
- PYGATEWAY_MAKE_SUPPORT2({gname}, {name}, IID_{name}, {base_name})
+ {gname}(PyObject *instance) : {base_name}(instance) {{ ; }}
+ PYGATEWAY_MAKE_SUPPORT2({gname}, {name}, IID_{name}, {base_name})
"""
)
@@ -420,9 +418,7 @@ def _write_gw_cpp(f, interface):
// ---------------------------------------------------
//
// Gateway Implementation
-""".format(
- name=name, gname=gname, base_name=base_name
- )
+"""
)
for method in interface.methods:
diff --git a/com/win32com/makegw/makegwenum.py b/com/win32com/makegw/makegwenum.py
index d541307d12..662dff4b67 100644
--- a/com/win32com/makegw/makegwenum.py
+++ b/com/win32com/makegw/makegwenum.py
@@ -7,6 +7,7 @@
This module is notmally not used directly - the @makegw@ module
automatically calls this.
"""
+
#
# INTERNAL FUNCTIONS
#
@@ -44,9 +45,9 @@ def _write_enumifc_cpp(f, interface):
// Interface Implementation
PyIEnum{enumtype}::PyIEnum{enumtype}(IUnknown *pdisp):
- PyIUnknown(pdisp)
+ PyIUnknown(pdisp)
{{
- ob_type = &type;
+ ob_type = &type;
}}
PyIEnum{enumtype}::~PyIEnum{enumtype}()
@@ -55,141 +56,141 @@ def _write_enumifc_cpp(f, interface):
/* static */ IEnum{enumtype} *PyIEnum{enumtype}::GetI(PyObject *self)
{{
- return (IEnum{enumtype} *)PyIUnknown::GetI(self);
+ return (IEnum{enumtype} *)PyIUnknown::GetI(self);
}}
// @pymethod object|PyIEnum{enumtype}|Next|Retrieves a specified number of items in the enumeration sequence.
PyObject *PyIEnum{enumtype}::Next(PyObject *self, PyObject *args)
{{
- long celt = 1;
- // @pyparm int|num|1|Number of items to retrieve.
- if ( !PyArg_ParseTuple(args, "|l:Next", &celt) )
- return NULL;
-
- IEnum{enumtype} *pIE{enumtype} = GetI(self);
- if ( pIE{enumtype} == NULL )
- return NULL;
-
- {arraydeclare}
- if ( rgVar == NULL ) {{
- PyErr_SetString(PyExc_MemoryError, "allocating result {enumtype}s");
- return NULL;
- }}
-
- int i;
-/* for ( i = celt; i--; )
- // *** possibly init each structure element???
+ long celt = 1;
+ // @pyparm int|num|1|Number of items to retrieve.
+ if ( !PyArg_ParseTuple(args, "|l:Next", &celt) )
+ return NULL;
+
+ IEnum{enumtype} *pIE{enumtype} = GetI(self);
+ if ( pIE{enumtype} == NULL )
+ return NULL;
+
+ {arraydeclare}
+ if ( rgVar == NULL ) {{
+ PyErr_SetString(PyExc_MemoryError, "allocating result {enumtype}s");
+ return NULL;
+ }}
+
+ int i;
+/* for ( i = celt; i--; )
+ // *** possibly init each structure element???
*/
- ULONG celtFetched = 0;
- PY_INTERFACE_PRECALL;
- HRESULT hr = pIE{enumtype}->Next(celt, rgVar, &celtFetched);
- PY_INTERFACE_POSTCALL;
- if ( HRESULT_CODE(hr) != ERROR_NO_MORE_ITEMS && FAILED(hr) )
- {{
- delete [] rgVar;
- return PyCom_BuildPyException(hr,pIE{enumtype}, IID_IE{enumtype});
- }}
-
- PyObject *result = PyTuple_New(celtFetched);
- if ( result != NULL )
- {{
- for ( i = celtFetched; i--; )
- {{
- {converter}
- if ( ob == NULL )
- {{
- Py_DECREF(result);
- result = NULL;
- break;
- }}
- PyTuple_SET_ITEM(result, i, ob);
- }}
- }}
-
-/* for ( i = celtFetched; i--; )
- // *** possibly cleanup each structure element???
+ ULONG celtFetched = 0;
+ PY_INTERFACE_PRECALL;
+ HRESULT hr = pIE{enumtype}->Next(celt, rgVar, &celtFetched);
+ PY_INTERFACE_POSTCALL;
+ if ( HRESULT_CODE(hr) != ERROR_NO_MORE_ITEMS && FAILED(hr) )
+ {{
+ delete [] rgVar;
+ return PyCom_BuildPyException(hr,pIE{enumtype}, IID_IE{enumtype});
+ }}
+
+ PyObject *result = PyTuple_New(celtFetched);
+ if ( result != NULL )
+ {{
+ for ( i = celtFetched; i--; )
+ {{
+ {converter}
+ if ( ob == NULL )
+ {{
+ Py_DECREF(result);
+ result = NULL;
+ break;
+ }}
+ PyTuple_SET_ITEM(result, i, ob);
+ }}
+ }}
+
+/* for ( i = celtFetched; i--; )
+ // *** possibly cleanup each structure element???
*/
- delete [] rgVar;
- return result;
+ delete [] rgVar;
+ return result;
}}
// @pymethod |PyIEnum{enumtype}|Skip|Skips over the next specified elementes.
PyObject *PyIEnum{enumtype}::Skip(PyObject *self, PyObject *args)
{{
- long celt;
- if ( !PyArg_ParseTuple(args, "l:Skip", &celt) )
- return NULL;
-
- IEnum{enumtype} *pIE{enumtype} = GetI(self);
- if ( pIE{enumtype} == NULL )
- return NULL;
-
- PY_INTERFACE_PRECALL;
- HRESULT hr = pIE{enumtype}->Skip(celt);
- PY_INTERFACE_POSTCALL;
- if ( FAILED(hr) )
- return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
-
- Py_INCREF(Py_None);
- return Py_None;
+ long celt;
+ if ( !PyArg_ParseTuple(args, "l:Skip", &celt) )
+ return NULL;
+
+ IEnum{enumtype} *pIE{enumtype} = GetI(self);
+ if ( pIE{enumtype} == NULL )
+ return NULL;
+
+ PY_INTERFACE_PRECALL;
+ HRESULT hr = pIE{enumtype}->Skip(celt);
+ PY_INTERFACE_POSTCALL;
+ if ( FAILED(hr) )
+ return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
+
+ Py_INCREF(Py_None);
+ return Py_None;
}}
// @pymethod |PyIEnum{enumtype}|Reset|Resets the enumeration sequence to the beginning.
PyObject *PyIEnum{enumtype}::Reset(PyObject *self, PyObject *args)
{{
- if ( !PyArg_ParseTuple(args, ":Reset") )
- return NULL;
+ if ( !PyArg_ParseTuple(args, ":Reset") )
+ return NULL;
- IEnum{enumtype} *pIE{enumtype} = GetI(self);
- if ( pIE{enumtype} == NULL )
- return NULL;
+ IEnum{enumtype} *pIE{enumtype} = GetI(self);
+ if ( pIE{enumtype} == NULL )
+ return NULL;
- PY_INTERFACE_PRECALL;
- HRESULT hr = pIE{enumtype}->Reset();
- PY_INTERFACE_POSTCALL;
- if ( FAILED(hr) )
- return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
+ PY_INTERFACE_PRECALL;
+ HRESULT hr = pIE{enumtype}->Reset();
+ PY_INTERFACE_POSTCALL;
+ if ( FAILED(hr) )
+ return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
- Py_INCREF(Py_None);
- return Py_None;
+ Py_INCREF(Py_None);
+ return Py_None;
}}
// @pymethod |PyIEnum{enumtype}|Clone|Creates another enumerator that contains the same enumeration state as the current one
PyObject *PyIEnum{enumtype}::Clone(PyObject *self, PyObject *args)
{{
- if ( !PyArg_ParseTuple(args, ":Clone") )
- return NULL;
+ if ( !PyArg_ParseTuple(args, ":Clone") )
+ return NULL;
- IEnum{enumtype} *pIE{enumtype} = GetI(self);
- if ( pIE{enumtype} == NULL )
- return NULL;
+ IEnum{enumtype} *pIE{enumtype} = GetI(self);
+ if ( pIE{enumtype} == NULL )
+ return NULL;
- IEnum{enumtype} *pClone;
- PY_INTERFACE_PRECALL;
- HRESULT hr = pIE{enumtype}->Clone(&pClone);
- PY_INTERFACE_POSTCALL;
- if ( FAILED(hr) )
- return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
+ IEnum{enumtype} *pClone;
+ PY_INTERFACE_PRECALL;
+ HRESULT hr = pIE{enumtype}->Clone(&pClone);
+ PY_INTERFACE_POSTCALL;
+ if ( FAILED(hr) )
+ return PyCom_BuildPyException(hr, pIE{enumtype}, IID_IE{enumtype});
- return PyCom_PyObjectFromIUnknown(pClone, IID_IEnum{enumtype}, FALSE);
+ return PyCom_PyObjectFromIUnknown(pClone, IID_IEnum{enumtype}, FALSE);
}}
// @object PyIEnum{enumtype}|A Python interface to IEnum{enumtype}
static struct PyMethodDef PyIEnum{enumtype}_methods[] =
{{
- {{ "Next", PyIEnum{enumtype}::Next, 1 }}, // @pymeth Next|Retrieves a specified number of items in the enumeration sequence.
- {{ "Skip", PyIEnum{enumtype}::Skip, 1 }}, // @pymeth Skip|Skips over the next specified elementes.
- {{ "Reset", PyIEnum{enumtype}::Reset, 1 }}, // @pymeth Reset|Resets the enumeration sequence to the beginning.
- {{ "Clone", PyIEnum{enumtype}::Clone, 1 }}, // @pymeth Clone|Creates another enumerator that contains the same enumeration state as the current one.
- {{ NULL }}
+ {{ "Next", PyIEnum{enumtype}::Next, 1 }}, // @pymeth Next|Retrieves a specified number of items in the enumeration sequence.
+ {{ "Skip", PyIEnum{enumtype}::Skip, 1 }}, // @pymeth Skip|Skips over the next specified elementes.
+ {{ "Reset", PyIEnum{enumtype}::Reset, 1 }}, // @pymeth Reset|Resets the enumeration sequence to the beginning.
+ {{ "Clone", PyIEnum{enumtype}::Clone, 1 }}, // @pymeth Clone|Creates another enumerator that contains the same enumeration state as the current one.
+ {{ NULL }}
}};
PyComEnumTypeObject PyIEnum{enumtype}::type("PyIEnum{enumtype}",
- &PyIUnknown::type,
- sizeof(PyIEnum{enumtype}),
- PyIEnum{enumtype}_methods,
- GET_PYCOM_CTOR(PyIEnum{enumtype}));
+ &PyIUnknown::type,
+ sizeof(PyIEnum{enumtype}),
+ PyIEnum{enumtype}_methods,
+ GET_PYCOM_CTOR(PyIEnum{enumtype}));
""".format(
**locals()
)
@@ -230,103 +231,103 @@ def _write_enumgw_cpp(f, interface):
/* [length_is][size_is][out] */ {argdeclare},
/* [out] */ ULONG __RPC_FAR *pCeltFetched)
{{
- PY_GATEWAY_METHOD;
- PyObject *result;
- HRESULT hr = InvokeViaPolicy("Next", &result, "i", celt);
- if ( FAILED(hr) )
- return hr;
-
- if ( !PySequence_Check(result) )
- goto error;
- int len;
- len = PyObject_Length(result);
- if ( len == -1 )
- goto error;
- if ( len > (int)celt)
- len = celt;
-
- if ( pCeltFetched )
- *pCeltFetched = len;
-
- int i;
- for ( i = 0; i < len; ++i )
- {{
- PyObject *ob = PySequence_GetItem(result, i);
- if ( ob == NULL )
- goto error;
-
- {converter}
- {{
- Py_DECREF(result);
- return PyCom_SetCOMErrorFromPyException(IID_IEnum{enumtype});
- }}
- }}
-
- Py_DECREF(result);
-
- return len < (int)celt ? S_FALSE : S_OK;
+ PY_GATEWAY_METHOD;
+ PyObject *result;
+ HRESULT hr = InvokeViaPolicy("Next", &result, "i", celt);
+ if ( FAILED(hr) )
+ return hr;
+
+ if ( !PySequence_Check(result) )
+ goto error;
+ int len;
+ len = PyObject_Length(result);
+ if ( len == -1 )
+ goto error;
+ if ( len > (int)celt)
+ len = celt;
+
+ if ( pCeltFetched )
+ *pCeltFetched = len;
+
+ int i;
+ for ( i = 0; i < len; ++i )
+ {{
+ PyObject *ob = PySequence_GetItem(result, i);
+ if ( ob == NULL )
+ goto error;
+
+ {converter}
+ {{
+ Py_DECREF(result);
+ return PyCom_SetCOMErrorFromPyException(IID_IEnum{enumtype});
+ }}
+ }}
+
+ Py_DECREF(result);
+
+ return len < (int)celt ? S_FALSE : S_OK;
error:
- PyErr_Clear(); // just in case
- Py_DECREF(result);
- return PyCom_HandleIEnumNoSequence(IID_IEnum{enumtype});
+ PyErr_Clear(); // just in case
+ Py_DECREF(result);
+ return PyCom_HandleIEnumNoSequence(IID_IEnum{enumtype});
}}
STDMETHODIMP PyGEnum{enumtype}::Skip(
/* [in] */ ULONG celt)
{{
- PY_GATEWAY_METHOD;
- return InvokeViaPolicy("Skip", NULL, "i", celt);
+ PY_GATEWAY_METHOD;
+ return InvokeViaPolicy("Skip", NULL, "i", celt);
}}
STDMETHODIMP PyGEnum{enumtype}::Reset(void)
{{
- PY_GATEWAY_METHOD;
- return InvokeViaPolicy("Reset");
+ PY_GATEWAY_METHOD;
+ return InvokeViaPolicy("Reset");
}}
STDMETHODIMP PyGEnum{enumtype}::Clone(
/* [out] */ IEnum{enumtype} __RPC_FAR *__RPC_FAR *ppEnum)
{{
- PY_GATEWAY_METHOD;
- PyObject * result;
- HRESULT hr = InvokeViaPolicy("Clone", &result);
- if ( FAILED(hr) )
- return hr;
-
- /*
- ** Make sure we have the right kind of object: we should have some kind
- ** of IUnknown subclass wrapped into a PyIUnknown instance.
- */
- if ( !PyIBase::is_object(result, &PyIUnknown::type) )
- {{
- /* the wrong kind of object was returned to us */
- Py_DECREF(result);
- return PyCom_SetCOMErrorFromSimple(E_FAIL, IID_IEnum{enumtype});
- }}
-
- /*
- ** Get the IUnknown out of the thing. note that the Python ob maintains
- ** a reference, so we don't have to explicitly AddRef() here.
- */
- IUnknown *punk = ((PyIUnknown *)result)->m_obj;
- if ( !punk )
- {{
- /* damn. the object was released. */
- Py_DECREF(result);
- return PyCom_SetCOMErrorFromSimple(E_FAIL, IID_IEnum{enumtype});
- }}
-
- /*
- ** Get the interface we want. note it is returned with a refcount.
- ** This QI is actually going to instantiate a PyGEnum{enumtype}.
- */
- hr = punk->QueryInterface(IID_IEnum{enumtype}, (LPVOID *)ppEnum);
-
- /* done with the result; this DECREF is also for */
- Py_DECREF(result);
-
- return PyCom_CheckIEnumNextResult(hr, IID_IEnum{enumtype});
+ PY_GATEWAY_METHOD;
+ PyObject * result;
+ HRESULT hr = InvokeViaPolicy("Clone", &result);
+ if ( FAILED(hr) )
+ return hr;
+
+ /*
+ ** Make sure we have the right kind of object: we should have some kind
+ ** of IUnknown subclass wrapped into a PyIUnknown instance.
+ */
+ if ( !PyIBase::is_object(result, &PyIUnknown::type) )
+ {{
+ /* the wrong kind of object was returned to us */
+ Py_DECREF(result);
+ return PyCom_SetCOMErrorFromSimple(E_FAIL, IID_IEnum{enumtype});
+ }}
+
+ /*
+ ** Get the IUnknown out of the thing. note that the Python ob maintains
+ ** a reference, so we don't have to explicitly AddRef() here.
+ */
+ IUnknown *punk = ((PyIUnknown *)result)->m_obj;
+ if ( !punk )
+ {{
+ /* damn. the object was released. */
+ Py_DECREF(result);
+ return PyCom_SetCOMErrorFromSimple(E_FAIL, IID_IEnum{enumtype});
+ }}
+
+ /*
+ ** Get the interface we want. note it is returned with a refcount.
+ ** This QI is actually going to instantiate a PyGEnum{enumtype}.
+ */
+ hr = punk->QueryInterface(IID_IEnum{enumtype}, (LPVOID *)ppEnum);
+
+ /* done with the result; this DECREF is also for */
+ Py_DECREF(result);
+
+ return PyCom_CheckIEnumNextResult(hr, IID_IEnum{enumtype});
}}
""".format(
**locals()
diff --git a/com/win32com/makegw/makegwparse.py b/com/win32com/makegw/makegwparse.py
index ba32c7fa36..63b4692b8a 100644
--- a/com/win32com/makegw/makegwparse.py
+++ b/com/win32com/makegw/makegwparse.py
@@ -11,6 +11,7 @@
See the @win32com.makegw@ module for information in building a COM
interface
"""
+
import re
import traceback
@@ -34,10 +35,10 @@ def __init__(self, msg="The required functionality is not supported"):
class ArgFormatter:
- """An instance for a specific type of argument. Knows how to convert itself"""
+ """An instance for a specific type of argument. Knows how to convert itself"""
def __init__(self, arg, builtinIndirection, declaredIndirection=0):
- # print 'init:', arg.name, builtinIndirection, declaredIndirection, arg.indirectionLevel
+ # print("init:", arg.name, builtinIndirection, declaredIndirection, arg.indirectionLevel)
self.arg = arg
self.builtinIndirection = builtinIndirection
self.declaredIndirection = declaredIndirection
@@ -64,7 +65,14 @@ def _IndirectPrefix(self, indirectionFrom, indirectionTo):
raise error_not_supported("Can't indirect this far - please fix me :-)")
def GetIndirectedArgName(self, indirectFrom, indirectionTo):
- # print 'get:',self.arg.name, indirectFrom,self._GetDeclaredIndirection() + self.builtinIndirection, indirectionTo, self.arg.indirectionLevel
+ # print(
+ # "get:",
+ # self.arg.name,
+ # indirectFrom,
+ # self._GetDeclaredIndirection() + self.builtinIndirection,
+ # indirectionTo,
+ # self.arg.indirectionLevel,
+ # )
if indirectFrom is None:
### ACK! this does not account for [in][out] variables.
@@ -206,7 +214,7 @@ def GetAutoduckString(self):
)
def _GetPythonTypeDesc(self):
- "Returns a string with the description of the type. Used for doco purposes"
+ "Returns a string with the description of the type. Used for doco purposes"
return None
def NeedUSES_CONVERSION(self):
@@ -835,7 +843,7 @@ def BuildFromFile(self, file):
if VERBOSE:
print(
- " Arg {} of type {}{} ({})".format(
+ " Arg {} of type {}{} ({})".format(
self.name, self.type, "*" * self.indirectionLevel, self.inout
)
)
@@ -895,7 +903,7 @@ def BuildFromFile(self, file):
"Method %s - Only HRESULT return types are supported." % self.name
)
# raise error_not_supported, if VERBOSE:
- print(f" Method {self.result} {self.name}(")
+ print(f" Method {self.result} {self.name}(")
while 1:
arg = Argument(self.good_interface_names)
try:
diff --git a/com/win32com/server/connect.py b/com/win32com/server/connect.py
index 5c9a2dfe4a..f9ffcd29ae 100644
--- a/com/win32com/server/connect.py
+++ b/com/win32com/server/connect.py
@@ -2,6 +2,7 @@
A collection of helpers for server side connection points.
"""
+
import pythoncom
import win32com.server.util
import winerror
diff --git a/com/win32com/server/dispatcher.py b/com/win32com/server/dispatcher.py
index 0b21d3c089..8f7fa46127 100644
--- a/com/win32com/server/dispatcher.py
+++ b/com/win32com/server/dispatcher.py
@@ -2,6 +2,7 @@
Please see policy.py for a discussion on dispatchers and policies
"""
+
import traceback
from sys import exc_info
diff --git a/com/win32com/server/exception.py b/com/win32com/server/exception.py
index 5a4b304271..3004f5f43a 100644
--- a/com/win32com/server/exception.py
+++ b/com/win32com/server/exception.py
@@ -2,16 +2,17 @@
Exceptions
- To better support COM exceptions, the framework allows for an instance to be
- raised. This instance may have a certain number of known attributes, which are
- translated into COM exception details.
-
- This means, for example, that Python could raise a COM exception that includes details
- on a Help file and location, and a description for the user.
-
- This module provides a class which provides the necessary attributes.
+ To better support COM exceptions, the framework allows for an instance to be
+ raised. This instance may have a certain number of known attributes, which are
+ translated into COM exception details.
+
+ This means, for example, that Python could raise a COM exception that includes details
+ on a Help file and location, and a description for the user.
+
+ This module provides a class which provides the necessary attributes.
"""
+
import sys
import pythoncom
@@ -90,10 +91,7 @@ def __repr__(self):
def IsCOMException(t=None):
if t is None:
t = sys.exc_info()[0]
- try:
- return issubclass(t, pythoncom.com_error)
- except TypeError: # 1.5 in -X mode?
- return t is pythoncom.com_error
+ return issubclass(t, pythoncom.com_error)
def IsCOMServerException(t=None):
diff --git a/com/win32com/server/policy.py b/com/win32com/server/policy.py
index 7d46d83d02..a36213eb9c 100644
--- a/com/win32com/server/policy.py
+++ b/com/win32com/server/policy.py
@@ -66,6 +66,7 @@
problem, rather than a COM error.
"""
+
__author__ = "Greg Stein and Mark Hammond"
import sys
diff --git a/com/win32com/server/register.py b/com/win32com/server/register.py
index 211e7428b6..ad38133176 100644
--- a/com/win32com/server/register.py
+++ b/com/win32com/server/register.py
@@ -6,6 +6,7 @@
construct the necessary Python object, and dispatch COM events.
"""
+
import os
import sys
@@ -96,7 +97,7 @@ def _cat_registrar():
def _find_localserver_exe(mustfind):
if sys.platform != "win32":
return sys.executable
- if pythoncom.__file__.find("_d") < 0:
+ if os.path.splitext(os.path.basename(pythoncom.__file__))[0].endswith("_d"):
exeBaseName = "pythonw.exe"
else:
exeBaseName = "pythonw_d.exe"
@@ -234,7 +235,13 @@ def RegisterServer(
# Although now we prefer a 'loader' DLL if it exists to avoid some
# manifest issues (the 'loader' DLL has a manifest, but pythoncom does not)
pythoncom_dir = os.path.dirname(pythoncom.__file__)
- suffix = "_d" if "_d" in pythoncom.__file__ else ""
+ suffix = (
+ "_d"
+ if os.path.splitext(os.path.basename(pythoncom.__file__))[0].endswith(
+ "_d"
+ )
+ else ""
+ )
# Always register with the full path to the DLLs.
loadername = os.path.join(
pythoncom_dir,
diff --git a/com/win32com/server/util.py b/com/win32com/server/util.py
index c46dd375d9..d8682460a9 100644
--- a/com/win32com/server/util.py
+++ b/com/win32com/server/util.py
@@ -1,5 +1,6 @@
""" General Server side utilities
"""
+
import pythoncom
import winerror
@@ -144,7 +145,7 @@ def __init__(self, data=None, readOnly=0):
self._public_methods_ = ["Item", "Count"]
# This method is also used as the "default" method.
- # Thus "print ob" will cause this to be called with zero
+ # Thus "print(ob)" will cause this to be called with zero
# params. Handle this slightly more elegantly here.
# Ideally the policy should handle this.
def Item(self, *args):
diff --git a/com/win32com/servers/dictionary.py b/com/win32com/servers/dictionary.py
index c8ec986377..12cd3be5b1 100644
--- a/com/win32com/servers/dictionary.py
+++ b/com/win32com/servers/dictionary.py
@@ -27,11 +27,10 @@
the dictionary's keys. This allows for the following type of VB code:
for each name in ob
- debug.print name, ob(name)
+ debug.print(name, ob(name))
next
"""
-
import pythoncom
import pywintypes
import winerror
diff --git a/com/win32com/servers/perfmon.py b/com/win32com/servers/perfmon.py
index 861c694097..0a0aaaf812 100644
--- a/com/win32com/servers/perfmon.py
+++ b/com/win32com/servers/perfmon.py
@@ -1,9 +1,10 @@
"""A COM Server which exposes the NT Performance monitor in a very rudimentary way
Usage from VB:
- set ob = CreateObject("Python.PerfmonQuery")
- freeBytes = ob.Query("Memory", "Available Bytes")
+ set ob = CreateObject("Python.PerfmonQuery")
+ freeBytes = ob.Query("Memory", "Available Bytes")
"""
+
import pythoncom
import win32pdhutil
import winerror
diff --git a/com/win32com/src/PythonCOMLoader.cpp b/com/win32com/src/PythonCOMLoader.cpp
index daca9ac3ad..e9a149748b 100644
--- a/com/win32com/src/PythonCOMLoader.cpp
+++ b/com/win32com/src/PythonCOMLoader.cpp
@@ -1,5 +1,5 @@
-// *sob* - a simple loader for pythoncomxx.dll - but this DLL has a
-// manifest referencing the CRT whereas pythoncomxx.dll does not.
+// *sob* - a simple loader for pythoncomXX.dll - but this DLL has a
+// manifest referencing the CRT whereas pythoncomXX.dll does not.
#include "windows.h"
#include "tchar.h"
@@ -61,7 +61,7 @@ typedef HRESULT(STDAPICALLTYPE *PFNDllGetClassObject)(REFCLSID rclsid, REFIID ri
PFNDllGetClassObject pfnDllGetClassObject = NULL;
/////////////////////////////////////////////////////////////////////////////
-// Loads pythoncomxx.dll after activating our context and delegates the call to it.
+// Loads pythoncomXX.dll after activating our context and delegates the call to it.
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
if (pfnDllGetClassObject == 0) {
diff --git a/com/win32com/src/include/PythonCOM.h b/com/win32com/src/include/PythonCOM.h
index e759971792..c8b7da82fa 100644
--- a/com/win32com/src/include/PythonCOM.h
+++ b/com/win32com/src/include/PythonCOM.h
@@ -77,10 +77,10 @@
#define PYCOM_EXPORT
#else
#ifdef BUILD_PYTHONCOM
-/* We are building pythoncomxx.dll */
+/* We are building pythoncomXX.dll */
#define PYCOM_EXPORT __declspec(dllexport)
#else
-/* This module uses pythoncomxx.dll */
+/* This module uses pythoncomXX.dll */
#define PYCOM_EXPORT __declspec(dllimport)
#ifndef _DEBUG
#pragma comment(lib, "pythoncom.lib")
diff --git a/com/win32com/src/oleargs.cpp b/com/win32com/src/oleargs.cpp
index a28bbc0d64..c6fad6c215 100644
--- a/com/win32com/src/oleargs.cpp
+++ b/com/win32com/src/oleargs.cpp
@@ -127,7 +127,7 @@ BOOL PyCom_VariantFromPyObject(PyObject *obj, VARIANT *var)
}
V_VT(var) = VT_BSTR;
}
- // For 3.x, bool checks need to be above PyLong_Check, which now succeeds for booleans.
+ // For Python 3, bool checks need to be above PyLong_Check, which now succeeds for booleans.
else if (obj == Py_True) {
V_VT(var) = VT_BOOL;
V_BOOL(var) = VARIANT_TRUE;
@@ -593,7 +593,7 @@ static BOOL PyCom_SAFEARRAYFromPyObjectBuildDimension(PyObject *obj, SAFEARRAY *
static long PyCom_CalculatePyObjectDimension(PyObject *obItemCheck, long lDimension, PyObject *ppyobDimensionDictionary)
{
// Buffers are a special case - they define 1 new dimension.
- // Buffers supported sequence semantics in 2.x, but for some reason memoryview objects
+ // Buffers supported sequence semantics in Python 2, but for some reason memoryview objects
// in py3k do not, so check separately
if (PYWIN_BUFFER_CHECK(obItemCheck))
return lDimension + 1;
diff --git a/com/win32com/test/pippo_server.py b/com/win32com/test/pippo_server.py
index 1c2219d8c9..ac3a00c788 100644
--- a/com/win32com/test/pippo_server.py
+++ b/com/win32com/test/pippo_server.py
@@ -41,7 +41,10 @@ def Method3(self, in1):
def BuildTypelib():
- from distutils.dep_util import newer
+ if sys.version_info >= (3, 8):
+ from setuptools.modified import newer
+ else:
+ from distutils.dep_util import newer
this_dir = os.path.dirname(__file__)
idl = os.path.abspath(os.path.join(this_dir, "pippo.idl"))
diff --git a/com/win32com/test/testAccess.py b/com/win32com/test/testAccess.py
index 1d41eb6fc5..50332db021 100644
--- a/com/win32com/test/testAccess.py
+++ b/com/win32com/test/testAccess.py
@@ -122,8 +122,8 @@ def DoDumpAccessInfo(dbname):
forms = a.Forms
print("There are %d forms open." % (len(forms)))
# Uncommenting these lines means Access remains open.
- # for form in forms:
- # print " %s" % form.Name
+ # for form in forms:
+ # print(f" {form.Name}")
reports = a.Reports
print("There are %d reports open" % (len(reports)))
finally:
diff --git a/com/win32com/test/testCollections.py b/com/win32com/test/testCollections.py
index 999c65b09f..10bfce775b 100644
--- a/com/win32com/test/testCollections.py
+++ b/com/win32com/test/testCollections.py
@@ -102,10 +102,10 @@ def TestEnum(quiet=None):
TestEnumAgainst(o, check)
### This does not work!
- # if not quiet: print "Indexed replace item test"
- # o[2] = 'Replaced Item'
- # check[2] = 'Replaced Item'
- # TestEnumAgainst(o, check)
+ # if not quiet: print("Indexed replace item test")
+ # o[2] = 'Replaced Item'
+ # check[2] = 'Replaced Item'
+ # TestEnumAgainst(o, check)
try:
o()
diff --git a/com/win32com/test/testExchange.py b/com/win32com/test/testExchange.py
index bad0e121e6..fa2ac5cb05 100644
--- a/com/win32com/test/testExchange.py
+++ b/com/win32com/test/testExchange.py
@@ -75,8 +75,8 @@ def DumpFolders(session):
def TestAddress(session):
- # entry = session.GetAddressEntry("Skip")
- # print entry
+ # entry = session.GetAddressEntry("Skip")
+ # print(entry)
pass
diff --git a/com/win32com/test/testGIT.py b/com/win32com/test/testGIT.py
index 2ec6bc44b9..3f9a5f420a 100644
--- a/com/win32com/test/testGIT.py
+++ b/com/win32com/test/testGIT.py
@@ -134,7 +134,7 @@ def test(fn):
if __name__ == "__main__":
test(BeginThreadsSimpleMarshal)
win32api.Sleep(500)
- # Doing CoUninit here stop Pythoncom.dll hanging when DLLMain shuts-down the process
+ # Doing CoUninit here stop pythoncom.dll hanging when DLLMain shuts-down the process
pythoncom.CoUninitialize()
if pythoncom._GetInterfaceCount() != 0 or pythoncom._GetGatewayCount() != 0:
print(
diff --git a/com/win32com/test/testMarshal.py b/com/win32com/test/testMarshal.py
index c57d445f87..6c9a6ce902 100644
--- a/com/win32com/test/testMarshal.py
+++ b/com/win32com/test/testMarshal.py
@@ -52,7 +52,7 @@ def _doTestInThread(self, interp):
interp = win32com.client.Dispatch(interp)
interp.Exec("import win32api")
- # print "The test thread id is %d, Python.Interpreter's thread ID is %d" % (myThread, interp.Eval("win32api.GetCurrentThreadId()"))
+ # print(f"The test thread id is {myThread}, Python.Interpreter's thread ID is {interp.Eval('win32api.GetCurrentThreadId()')}")
pythoncom.CoUninitialize()
def BeginThreadsSimpleMarshal(self, numThreads):
@@ -108,7 +108,7 @@ def BeginThreadsFastMarshal(self, numThreads):
return threads, events
def _DoTestMarshal(self, fn, bCoWait=0):
- # print "The main thread is %d" % (win32api.GetCurrentThreadId())
+ # print(f"The main thread is {win32api.GetCurrentThreadId()}")
threads, events = fn(2)
numFinished = 0
while 1:
diff --git a/com/win32com/test/testPersist.py b/com/win32com/test/testPersist.py
index 76f7d84c96..5ca6053f7d 100644
--- a/com/win32com/test/testPersist.py
+++ b/com/win32com/test/testPersist.py
@@ -45,7 +45,7 @@ def WriteAt(self, offset, data):
print("WriteAt " + str(offset))
print("len " + str(len(data)))
print("data:")
- # print data
+ # print(data)
if len(self.data) >= offset:
newdata = self.data[0:offset] + data
print(len(newdata))
diff --git a/com/win32com/test/testROT.py b/com/win32com/test/testROT.py
index 5a4ccbcc8c..91e30894d5 100644
--- a/com/win32com/test/testROT.py
+++ b/com/win32com/test/testROT.py
@@ -22,7 +22,7 @@ def testit(self):
raise
# if num < 2:
- # print "Only", num, "objects in the ROT - this is unusual"
+ # print("Only", num, "objects in the ROT - this is unusual")
if __name__ == "__main__":
diff --git a/com/win32com/test/util.py b/com/win32com/test/util.py
index 73dfd1f2a0..a809875989 100644
--- a/com/win32com/test/util.py
+++ b/com/win32com/test/util.py
@@ -61,7 +61,7 @@ def RegisterPythonServer(filename, progids=None, verbose=0):
)
break
else:
- # print "Skipping registration of '%s' - already registered" % filename
+ # print(f"Skipping registration of '{filename}' - already registered")
return
# needs registration - see if its likely!
try:
@@ -89,7 +89,7 @@ def RegisterPythonServer(filename, progids=None, verbose=0):
cmd = f'{win32api.GetModuleFileName(0)} "{filename}" --unattended > nul 2>&1'
if verbose:
print("Registering engine", filename)
- # print cmd
+ # print(cmd)
rc = os.system(cmd)
if rc:
print("Registration command was:")
diff --git a/com/win32com/universal.py b/com/win32com/universal.py
index 6a87f6857e..055312acdc 100644
--- a/com/win32com/universal.py
+++ b/com/win32com/universal.py
@@ -68,7 +68,7 @@ def RegisterInterfaces(typelibGUID, lcid, major, minor, interface_names=None):
raise ValueError(
f"Interface '{name}' does not exist in this cached typelib"
)
- # print "Processing interface", name
+ # print("Processing interface", name)
sub_mod = gencache.GetModuleForCLSID(iid)
is_dispatch = getattr(sub_mod, name + "_vtables_dispatch_", None)
method_defs = getattr(sub_mod, name + "_vtables_", None)
@@ -100,10 +100,10 @@ def _CalcTypeSize(typeTuple):
# is trying to. We need to better place to warn about this, but it
# isn't here.
# try:
- # import warnings
- # warnings.warn("warning: records are known to not work for vtable interfaces")
+ # import warnings
+ # warnings.warn("warning: records are known to not work for vtable interfaces")
# except ImportError:
- # print "warning: records are known to not work for vtable interfaces"
+ # print("warning: records are known to not work for vtable interfaces")
cb = _univgw.SizeOfVT(pythoncom.VT_PTR)[1]
# cb = typeInfo.GetTypeAttr().cbSizeInstance
else:
diff --git a/com/win32com/util.py b/com/win32com/util.py
index 767e34a7cb..0a5748f1e1 100644
--- a/com/win32com/util.py
+++ b/com/win32com/util.py
@@ -2,6 +2,7 @@
This module contains a collection of general purpose utility functions.
"""
+
import pythoncom
import win32api
import win32con
diff --git a/com/win32comext/axdebug/adb.py b/com/win32comext/axdebug/adb.py
index 7f0984535d..2345ce5d69 100644
--- a/com/win32comext/axdebug/adb.py
+++ b/com/win32comext/axdebug/adb.py
@@ -1,5 +1,6 @@
"""The glue between the Python debugger interface and the Active Debugger interface
"""
+
import _thread
import bdb
import os
diff --git a/com/win32comext/axdebug/contexts.py b/com/win32comext/axdebug/contexts.py
index 8953f5ab9c..08443b2515 100644
--- a/com/win32comext/axdebug/contexts.py
+++ b/com/win32comext/axdebug/contexts.py
@@ -1,6 +1,7 @@
""" A module for managing the AXDebug I*Contexts
"""
+
from . import adb, axdebug, gateways
# Utility function for wrapping object created by this module.
diff --git a/com/win32comext/axdebug/documents.py b/com/win32comext/axdebug/documents.py
index 4b93e8c1d0..560901fb42 100644
--- a/com/win32comext/axdebug/documents.py
+++ b/com/win32comext/axdebug/documents.py
@@ -1,7 +1,6 @@
""" Management of documents for AXDebugging.
"""
-
import pythoncom
import win32api
from win32com.server.util import unwrap
diff --git a/com/win32comext/axscript/asputil.py b/com/win32comext/axscript/asputil.py
index b61c35373e..ad1c878daa 100644
--- a/com/win32comext/axscript/asputil.py
+++ b/com/win32comext/axscript/asputil.py
@@ -1,7 +1,7 @@
"""A utility module for ASP (Active Server Pages on MS Internet Info Server.
Contains:
- iif -- A utility function to avoid using "if" statements in ASP <% tags
+ iif -- A utility function to avoid using "if" statements in ASP <% tags
"""
diff --git a/com/win32comext/axscript/client/debug.py b/com/win32comext/axscript/client/debug.py
index b1d7dabec7..bdae7aac62 100644
--- a/com/win32comext/axscript/client/debug.py
+++ b/com/win32comext/axscript/client/debug.py
@@ -99,7 +99,7 @@ def Close(self):
self.adb.CloseApp()
self.adb = None
- # print "Close complete"
+ # print("Close complete")
def IsAnyHost(self):
"Do we have _any_ debugging interfaces installed?"
diff --git a/com/win32comext/axscript/client/framework.py b/com/win32comext/axscript/client/framework.py
index f94c553111..9dbdfd5533 100644
--- a/com/win32comext/axscript/client/framework.py
+++ b/com/win32comext/axscript/client/framework.py
@@ -6,6 +6,7 @@
There are classes defined for the engine itself, and for ScriptItems
"""
+
import re
import sys
@@ -168,7 +169,7 @@ def Build(self, typeinfo, funcdesc):
self.name = typeinfo.GetNames(self.dispid)[0]
-# print "Event.Build() - Event Name is ", self.name
+# print("Event.Build() - Event Name is ", self.name)
class EventSink:
@@ -207,7 +208,7 @@ def _invoke_(self, dispid, lcid, wFlags, args):
event = self.events[dispid]
except:
raise Exception(scode=winerror.DISP_E_MEMBERNOTFOUND)
- # print "Invoke for ", event, "on", self.myScriptItem, " - calling", self.myInvokeMethod
+ # print("Invoke for ", event, "on", self.myScriptItem, " - calling", self.myInvokeMethod)
return self.myInvokeMethod(self.myScriptItem, event, lcid, wFlags, args)
def GetSourceTypeInfo(self, typeinfo):
@@ -352,16 +353,16 @@ def Register(self):
if self.isRegistered:
return
# Get the type info to use to build this item.
- # if not self.dispatch:
- # id = self.parentItem.dispatch.GetIDsOfNames(self.name)
- # print "DispID of me is", id
- # result = self.parentItem.dispatch.Invoke(id, 0, pythoncom.DISPATCH_PROPERTYGET,1)
- # if isinstance(result, pythoncom.TypeIIDs[pythoncom.IID_IDispatch]):
- # self.dispatch = result
- # else:
- # print "*** No dispatch"
- # return
- # print "**** Made dispatch"
+ # if not self.dispatch:
+ # id = self.parentItem.dispatch.GetIDsOfNames(self.name)
+ # print("DispID of me is", id)
+ # result = self.parentItem.dispatch.Invoke(id, 0, pythoncom.DISPATCH_PROPERTYGET,1)
+ # if isinstance(result, pythoncom.TypeIIDs[pythoncom.IID_IDispatch]):
+ # self.dispatch = result
+ # else:
+ # print("*** No dispatch")
+ # return
+ # print("**** Made dispatch")
self.isRegistered = 1
# Register the sub-items.
for item in self.subItems.values():
@@ -516,7 +517,18 @@ def FindBuildSubItemEvents(self):
subObj = self.GetCreateSubItem(
self, name, result, axscript.SCRIPTITEM_ISVISIBLE
)
- # print "subobj", name, "flags are", subObj.flags, "mydisp=", self.dispatch, "result disp=", result, "compare=", self.dispatch==result
+ # print(
+ # "subobj",
+ # name,
+ # "flags are",
+ # subObj.flags,
+ # "mydisp=",
+ # self.dispatch,
+ # "result disp=",
+ # result,
+ # "compare=",
+ # self.dispatch == result,
+ # )
subObj.BuildEvents()
subObj.Register()
except pythoncom.com_error:
@@ -762,7 +774,7 @@ def GetScriptSite(self, iid):
return self.scriptSite.QueryInterface(iid)
def SetScriptState(self, state):
- # print "SetScriptState with %s - currentstate = %s" % (state_map.get(state),state_map.get(self.scriptState))
+ # print(f"SetScriptState with {state_map.get(state)} - currentstate = {state_map.get(self.scriptState)}"
if state == self.scriptState:
return
# If closed, allow no other state transitions
@@ -1049,7 +1061,7 @@ def Reset(self):
self.ChangeScriptState(axscript.SCRIPTSTATE_INITIALIZED)
def ChangeScriptState(self, state):
- # print " ChangeScriptState with %s - currentstate = %s" % (state_map.get(state),state_map.get(self.scriptState))
+ # print(f" ChangeScriptState with {state_map.get(state)} - currentstate = {state_map.get(self.scriptState)}")
self.DisableInterrupts()
try:
self.scriptState = state
@@ -1076,7 +1088,7 @@ def ApplyInScriptedSection(self, codeBlock, fn, args):
self.BeginScriptedSection()
try:
try:
- # print "ApplyInSS", codeBlock, fn, args
+ # print("ApplyInSS", codeBlock, fn, args)
return self._ApplyInScriptedSection(fn, args)
finally:
if self.debugManager:
diff --git a/com/win32comext/axscript/client/pyscript.py b/com/win32comext/axscript/client/pyscript.py
index 0ce08fc35e..dfa52e9b9a 100644
--- a/com/win32comext/axscript/client/pyscript.py
+++ b/com/win32comext/axscript/client/pyscript.py
@@ -252,9 +252,9 @@ def RegisterNamedItem(self, item):
if item.IsGlobal():
# Global items means sub-items are also added...
for subitem in item.subItems.values():
- self.globalNameSpaceModule.__dict__[
- subitem.name
- ] = subitem.attributeObject
+ self.globalNameSpaceModule.__dict__[subitem.name] = (
+ subitem.attributeObject
+ )
# Also add all methods
for name, entry in item.dispatchContainer._olerepr_.mapFuncs.items():
if not entry.hidden:
diff --git a/com/win32comext/axscript/client/pyscript_rexec.py b/com/win32comext/axscript/client/pyscript_rexec.py
index a07b5a1654..3224be89cf 100644
--- a/com/win32comext/axscript/client/pyscript_rexec.py
+++ b/com/win32comext/axscript/client/pyscript_rexec.py
@@ -31,7 +31,12 @@ class PyScriptRExec(pyscript.PyScript):
_reg_threading_ = "Apartment"
def _GetSupportedInterfaceSafetyOptions(self):
- # print "**** calling", pyscript.PyScript._GetSupportedInterfaceSafetyOptions, "**->", pyscript.PyScript._GetSupportedInterfaceSafetyOptions(self)
+ # print(
+ # "**** calling",
+ # pyscript.PyScript._GetSupportedInterfaceSafetyOptions,
+ # "**->",
+ # pyscript.PyScript._GetSupportedInterfaceSafetyOptions(self),
+ # )
return (
INTERFACE_USES_DISPEX
| INTERFACE_USES_SECURITY_MANAGER
diff --git a/com/win32comext/axscript/demos/client/asp/caps.asp b/com/win32comext/axscript/demos/client/asp/caps.asp
index 6b0342aa32..8ea7cf8de4 100644
--- a/com/win32comext/axscript/demos/client/asp/caps.asp
+++ b/com/win32comext/axscript/demos/client/asp/caps.asp
@@ -23,11 +23,11 @@ Response.Write("Win32 username is "+win32api.GetUserName())
<%
import sys
-print sys.path
+print(sys.path)
from win32com.axscript.asputil import *
-print "Hello"
-print "There"
-print "How are you"
+print("Hello")
+print("There")
+print("How are you")
%>
<%bc = Server.CreateObject("MSWC.BrowserType")%>
diff --git a/com/win32comext/axscript/demos/client/ie/CHARTPY.HTM b/com/win32comext/axscript/demos/client/ie/CHARTPY.HTM
index 4bba12c19e..fe7d1b5fbd 100644
--- a/com/win32comext/axscript/demos/client/ie/CHARTPY.HTM
+++ b/com/win32comext/axscript/demos/client/ie/CHARTPY.HTM
@@ -75,7 +75,7 @@ def DoChartType(WhatType):
# Turns horizontal gridlines on or off depending on value of chkHorizontal checkbox
def DoHorizontalGrid():
- print ax.chkHorizontal.Checked
+ print(ax.chkHorizontal.Checked)
if ax.chkHorizontal.Checked:
ax.Chart1.HGridStyle = 1
else:
diff --git a/com/win32comext/axscript/demos/client/ie/FOO.HTM b/com/win32comext/axscript/demos/client/ie/FOO.HTM
index 840672ff9c..34a880fa8d 100644
--- a/com/win32comext/axscript/demos/client/ie/FOO.HTM
+++ b/com/win32comext/axscript/demos/client/ie/FOO.HTM
@@ -39,7 +39,7 @@ End Sub