Skip to content
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

Jump to bottom

Fixed import issues in ocx and app pywin Demos #2291

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fixed import issues in ocx and app pywin Demos #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bd0363
Fixed import issues in ocx and app pywin Demos
Avasam Oct 4, 2024
a808cd1
Merge branch 'main' into mypy-Demos-imports
Avasam Oct 6, 2024
c0974bc
Merge branch 'main' into mypy-Demos-imports
Avasam Oct 12, 2024
e346f0d
Merge branch 'main' into mypy-Demos-imports
Avasam Oct 13, 2024
b2a71b8
Merge branch 'main' into mypy-Demos-imports
Avasam Oct 14, 2024
ef8b241
Merge branch 'main' into mypy-Demos-imports
Avasam Nov 11, 2024
92c226b
Merge branch 'main' of https://github.com/mhammond/pywin32 into mypy-…
Avasam Nov 11, 2024
ac8b6cb
Fix unrelated warnings
Avasam Nov 11, 2024
ac22550
Merge branch 'main' into mypy-Demos-imports
Avasam Nov 12, 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
4 changes: 1 addition & 3 deletions Pythonwin/pywin/Demos/app/demoutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,4 @@ def NeedApp():


if __name__ == "__main__":
import demoutils

demoutils.NotAScript()
NotAScript()
Empty file removed Pythonwin/pywin/Demos/ocx/__init__.py
View file
Open in desktop
Empty file.
4 changes: 1 addition & 3 deletions Pythonwin/pywin/Demos/ocx/demoutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,4 @@ def NeedApp():


if __name__ == "__main__":
from . import demoutils

demoutils.NotAScript()
NotAScript()
2 changes: 1 addition & 1 deletion Pythonwin/pywin/Demos/ocx/ocxserialtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test():


if __name__ == "__main__":
from . import demoutils
import demoutils

if demoutils.NeedGoodGUI():
test()
2 changes: 1 addition & 1 deletion Pythonwin/pywin/Demos/ocx/ocxtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def demo():


if __name__ == "__main__":
from . import demoutils
import demoutils

if demoutils.NeedGoodGUI():
testall()
Loading