Skip to content
Merged
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
3 changes: 2 additions & 1 deletion com/win32com/client/combrowse.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import sys

import pythoncom
import pywintypes
import win32api
import win32con
import win32ui
Expand Down Expand Up @@ -61,7 +62,7 @@ def CalculateIsExpandable(self):
class HLICLSID(HLICOM):
def __init__(self, myobject, name=None):
if isinstance(myobject, str):
myobject = pythoncom.MakeIID(myobject)
myobject = pywintypes.IID(myobject)
if name is None:
try:
name = pythoncom.ProgIDFromCLSID(myobject)
Expand Down
3 changes: 2 additions & 1 deletion com/win32com/demos/connect.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
# is cheated on - so this is still working as a fully-fledged server.

import pythoncom
import pywintypes
import win32com.server.connect
import win32com.server.util

# This is the IID of the Events interface both Client and Server support.
IID_IConnectDemoEvents = pythoncom.MakeIID("{A4988850-49C3-11d0-AE5D-52342E000000}")
IID_IConnectDemoEvents = pywintypes.IID("{A4988850-49C3-11d0-AE5D-52342E000000}")

# The server which implements
# Create a connectable class, that has a single public method
Expand Down
2 changes: 1 addition & 1 deletion com/win32com/server/policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def _wrap_(self, object):
if i[0] != "{":
i = pythoncom.InterfaceNames[i]
else:
i = pythoncom.MakeIID(i)
i = pywintypes.IID(i)
self._com_interfaces_.append(i)
else:
self._com_interfaces_ = []
Expand Down
3 changes: 2 additions & 1 deletion com/win32com/test/testDynamic.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Test dynamic policy, and running object table.

import pythoncom
import pywintypes
import winerror
from win32com.server.exception import COMException

iid = pythoncom.MakeIID("{b48969a0-784b-11d0-ae71-d23f56000000}")
iid = pywintypes.IID("{b48969a0-784b-11d0-ae71-d23f56000000}")


class VeryPermissive:
Expand Down
2 changes: 1 addition & 1 deletion com/win32com/test/testShell.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def testSimpleUnicode(self):
self._testSimple(True)

def testComplex(self):
clsid = pythoncom.MakeIID("{CD637886-DB8B-4b04-98B5-25731E1495BE}")
clsid = pywintypes.IID("{CD637886-DB8B-4b04-98B5-25731E1495BE}")
ctime, atime, wtime = self._getTestTimes()
d = {
"cFileName": "foo.txt",
Expand Down
3 changes: 2 additions & 1 deletion com/win32comext/axscript/test/leakTest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys

import pythoncom
import pywintypes
from win32com.axscript import axscript
from win32com.axscript.server import axsite
from win32com.server import connect, util
Expand Down Expand Up @@ -53,7 +54,7 @@ def echo(self, *args):
#### Connections currently won't work, as there is no way for the engine to
#### know what events we support. We need typeinfo support.

IID_ITestEvents = pythoncom.MakeIID("{8EB72F90-0D44-11d1-9C4B-00AA00125A98}")
IID_ITestEvents = pywintypes.IID("{8EB72F90-0D44-11d1-9C4B-00AA00125A98}")


class TestConnectServer(connect.ConnectableServer):
Expand Down
3 changes: 2 additions & 1 deletion com/win32comext/axscript/test/testHost.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import unittest

import pythoncom
import pywintypes
import win32com.server.policy
import win32com.test.util
from win32com.axscript import axscript
Expand Down Expand Up @@ -72,7 +73,7 @@ def fail(self, *args):
#### Connections currently won't work, as there is no way for the engine to
#### know what events we support. We need typeinfo support.

IID_ITestEvents = pythoncom.MakeIID("{8EB72F90-0D44-11d1-9C4B-00AA00125A98}")
IID_ITestEvents = pywintypes.IID("{8EB72F90-0D44-11d1-9C4B-00AA00125A98}")


class TestConnectServer(connect.ConnectableServer):
Expand Down