Skip to content

Change mbcs encoding to utf-8 in com/win32com/client #2097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhammond merged 4 commits into from
Nov 1, 2023
Merged

Change mbcs encoding to utf-8 in com/win32com/client #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e0db0e
Change mbcs encoding to utf-8
Avasam Aug 9, 2023
e755989
Unused sys import
Avasam Aug 9, 2023
79281a3
Reduce mbcs changes
Avasam Aug 10, 2023
7c3931d
Merge branch 'main' into mbcs-encoding-to-utf8
Avasam Aug 10, 2023
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: 0 additions & 3 deletions Pythonwin/pywin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,5 @@
# others are looking at it, but it will go away soon!
is_platform_unicode = 0

# Ditto default_platform_encoding - not referenced and will die.
default_platform_encoding = "mbcs"

# This one *is* real and used - but in practice can't be changed.
default_scintilla_encoding = "utf-8" # Scintilla _only_ supports this ATM
2 changes: 0 additions & 2 deletions Pythonwin/pywin/tools/hierlist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ def AddItem(self, parentHandle, item, hInsertAfter=commctrl.TVI_LAST):
bitmapSel = self.GetSelectedBitmapColumn(item)
if bitmapSel is None:
bitmapSel = bitmapCol
## if isinstance(text, str):
## text = text.encode("mbcs")
hitem = self.listControl.InsertItem(
parentHandle,
hInsertAfter,
Expand Down
4 changes: 2 additions & 2 deletions com/win32com/client/genpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ def BuildOleItemsFromType(self):

return oleItems, enumItems, recordItems, vtableItems

def open_writer(self, filename, encoding="mbcs"):
def open_writer(self, filename, encoding="utf-8"):
# A place to put code to open a file with the appropriate encoding.
# Does *not* set self.file - just opens and returns a file.
# Actually returns a handle to a temp file - finish_writer then deletes
Expand Down Expand Up @@ -1098,7 +1098,7 @@ def do_gen_file_header(self):
# We assert this is it may indicate somewhere in pywin32 that needs
# upgrading.
assert self.file.encoding, self.file
encoding = self.file.encoding # or "mbcs"
encoding = self.file.encoding

print("# -*- coding: %s -*-" % (encoding,), file=self.file)
print("# Created by makepy.py version %s" % (makepy_version,), file=self.file)
Expand Down