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

Stop using deprecated glob1 on Python 3.10+ #2358

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Stop using deprecated glob1 on Python 3.10+ #2358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions Pythonwin/pywin/framework/bitmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import os
import sys

import win32api
import win32con
import win32ui
from pywin.mfc import docview, window

from . import app

bStretch = 1


Expand Down Expand Up @@ -160,5 +159,10 @@ def demo():
import glob

winDir = win32api.GetWindowsDirectory()
for fileName in glob.glob1(winDir, "*.bmp")[:2]:
if sys.version_info >= (3, 10):
fileNames = glob.glob("*.bmp", root_dir=winDir)[:2]
else:
fileNames = glob.glob1(winDir, "*.bmp")[:2]

for fileName in fileNames:
bitmapTemplate.OpenDocumentFile(os.path.join(winDir, fileName))
Loading