admin/hakril-PythonForWindows
1
0
Fork 0
mirror of https://github.com/hakril/PythonForWindows synced 2026-06-08 14:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failed merge

Browse Source
This commit is contained in:
hakril
2024-05-20 13:30:54 +02:00
parent ae5bf70b49
commit 4120c6e7e3
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/rpc/ndr.py
-8
View File
@@ -267,11 +267,7 @@ class NdrGuid(object):
def pack(cls, data):
if not isinstance(data, gdef.IID):
data = gdef.IID.from_string(data)
<<<<<<< HEAD
return bytes(bytearray(data))
=======
return bytearray(data)
>>>>>>> 205311d (Working on WinAPI Wide-transition)
@classmethod
def unpack(self, stream):
@@ -288,11 +284,7 @@ class NdrContextHandle(object):
def pack(cls, data):
if not isinstance(data, gdef.IID):
data = gdef.IID.from_string(data)
<<<<<<< HEAD
return bytes(struct.pack("<I", 0) + bytearray(data))
=======
return struct.pack("<I", 0) + bytearray(data)
>>>>>>> 205311d (Working on WinAPI Wide-transition)
@classmethod
def unpack(self, stream):