Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion AutoDuck/pywin32.mak
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ HTML_FILES = $(WIN32_HELP_DIR)\*.html \
$(WIN32COM_DIR)/HTML/*.html \
$(WIN32COM_DIR)/HTML/image/* \
$(WIN32COM_HELP_DIR)/*.htm* \
$(WIN32COMEXT_DIR)/axscript/demos/client/ie/* \
$(ISAPI_DIR)/doc/*.html \
$(PYTHONWIN_DIR)/readme.html $(PYTHONWIN_DIR)/doc/* $(PYTHONWIN_DIR)/doc/debugger/* \
../CHANGES.txt \
Expand Down
2 changes: 0 additions & 2 deletions com/win32com/HTML/docindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ <H1>PythonCOM Documentation Index</H1>
<P><A HREF="package.html">A brief description of the win32com package structure</A></P>
<P><A HREF="PythonCOM.html">Python COM Implementation documentation</A></P>
<P><A HREF="misc.html">Misc stuff I don't know where to put anywhere else</A></P>
<H3>ActiveX Scripting</H3>
<P><A HREF="../../win32comext/axscript/demos/client/ie/demo.htm">ActiveX Scripting Demos</A></P></BODY>
</HTML>
43 changes: 1 addition & 42 deletions com/win32comext/axscript/client/framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -510,35 +510,13 @@ def FindBuildSubItemEvents(self):
result = self.dispatch.Invoke(
dispid, 0x0, pythoncom.DISPATCH_PROPERTYGET, 1
)
# IE has an interesting problem - there are lots of synonyms for the same object. Eg
# in a simple form, "window.top", "window.window", "window.parent", "window.self"
# all refer to the same object. Our event implementation code does not differentiate
# eg, "window_onload" will fire for *all* objects named "window". Thus,
# "window" and "window.window" will fire the same event handler :(
# One option would be to check if the sub-object is indeed the
# parent object - however, this would stop "top_onload" from firing,
# as no event handler for "top" would work.
# I think we simply need to connect to a *single* event handler.
# As use in IE is deprecated, I am not solving this now.
if isinstance(
result, pythoncom.TypeIIDs[pythoncom.IID_IDispatch]
):
name = names[0]
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,
# )
subObj.BuildEvents()
subObj.Register()
except pythoncom.com_error:
Expand Down Expand Up @@ -727,15 +705,6 @@ def ParseProcedureText(
startingLineNumber,
flags,
)
# NOTE - this is never called, as we have disabled this interface.
# Problem is, once enabled all even code comes via here, rather than AddScriptlet.
# However, the "procName" is always an empty string - ie, itemName is the object whose event we are handling,
# but no idea what the specific event is!?
# Problem is disabling this block is that AddScriptlet is _not_ passed
# <SCRIPT for="whatever" event="onClick" language="Python">
# (but even for those blocks, the "onClick" information is still missing!?!?!?)

# self.DoAddScriptlet(None, code, itemName, subItemName, eventName, delimiter,sourceContextCookie, startLineNumber)
return None

#
Expand Down Expand Up @@ -925,21 +894,11 @@ def Clone(self):
#
# IObjectSafety

# Note that IE seems to insist we say we support all the flags, even tho
# we don't accept them all. If unknown flags come in, they are ignored, and never
# reflected in GetInterfaceSafetyOptions and the QIs obviously fail, but still IE
# allows our engine to initialize.
def SetInterfaceSafetyOptions(self, iid, optionsMask, enabledOptions):
# trace ("SetInterfaceSafetyOptions", iid, optionsMask, enabledOptions)
# trace("SetInterfaceSafetyOptions", iid, optionsMask, enabledOptions)
if optionsMask & enabledOptions == 0:
return

# See comments above.
# if (optionsMask & enabledOptions & \
# ~(axscript.INTERFACESAFE_FOR_UNTRUSTED_DATA | axscript.INTERFACESAFE_FOR_UNTRUSTED_CALLER)):
# # request for options we don't understand
# RaiseAssert(scode=winerror.E_FAIL, desc="Unknown safety options")

if iid in [
pythoncom.IID_IPersist,
pythoncom.IID_IPersistStream,
Expand Down
5 changes: 2 additions & 3 deletions com/win32comext/axscript/client/pyscript.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,8 @@ def DoAddScriptlet(
):
# Just store the code away - compile when called. (JIT :-)
item = self.GetNamedItem(itemName)
if (
itemName == subItemName
): # Explicit handlers - eg <SCRIPT LANGUAGE="Python" for="TestForm" Event="onSubmit">
if itemName == subItemName:
# Explicit handlers - eg <SCRIPT LANGUAGE="Python" RUNAT=Server for="TestForm" Event="onSubmit">
subItem = item
else:
subItem = item.GetCreateSubItem(item, subItemName, None, None)
Expand Down
54 changes: 0 additions & 54 deletions com/win32comext/axscript/client/pyscript_rexec.py

This file was deleted.

179 changes: 0 additions & 179 deletions com/win32comext/axscript/demos/client/ie/CHARTPY.HTM

This file was deleted.

46 changes: 0 additions & 46 deletions com/win32comext/axscript/demos/client/ie/FOO.HTM

This file was deleted.

Loading