Skip to content

Commit

Permalink
Stop using deprecated glob1 on Python 3.10+ (#2358)
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam authored Oct 4, 2024
1 parent 0ff3156 commit a50b27f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Pythonwin/pywin/framework/bitmap.py
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))

0 comments on commit a50b27f

Please sign in to comment.