Skip to content

Remove lib2to3 comments and workarounds #2397

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
Avasam merged 2 commits into from
Dec 13, 2024
Merged

Remove lib2to3 comments and workarounds #2397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d546200
Remove lib2to3 comments and workarounds
Avasam Oct 13, 2024
74f72c2
Merge branch 'main' of https://github.com/mhammond/pywin32 into Remov…
Avasam Dec 13, 2024
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
11 changes: 4 additions & 7 deletions Pythonwin/pywin/mfc/dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
import win32con
import win32ui

# sob - 2to3 doesn't see this as a relative import :(
from pywin.mfc import window
from . import window


def dllFromDll(dllid):
Expand Down Expand Up @@ -258,21 +257,19 @@ def GetSimpleInput(prompt, defValue="", title=None):
# uses a simple dialog to return a string object.
if title is None:
title = win32ui.GetMainFrame().GetWindowText()
# 2to3 insists on converting 'Dialog.__init__' to 'tkinter.dialog...'
DlgBaseClass = Dialog

class DlgSimpleInput(DlgBaseClass):
class DlgSimpleInput(Dialog):
def __init__(self, prompt, defValue, title):
self.title = title
DlgBaseClass.__init__(self, win32ui.IDD_SIMPLE_INPUT)
Dialog.__init__(self, win32ui.IDD_SIMPLE_INPUT)
self.AddDDX(win32ui.IDC_EDIT1, "result")
self.AddDDX(win32ui.IDC_PROMPT1, "prompt")
self._obj_.data["result"] = defValue
self._obj_.data["prompt"] = prompt

def OnInitDialog(self):
self.SetWindowText(self.title)
return DlgBaseClass.OnInitDialog(self)
return Dialog.OnInitDialog(self)

dlg = DlgSimpleInput(prompt, defValue, title)
if dlg.DoModal() != win32con.IDOK:
Expand Down