From 99059317f3cbfd25aeb7a03394ff6713ddbb451a Mon Sep 17 00:00:00 2001 From: John Swinbank Date: Tue, 19 Nov 2013 14:16:14 +0100 Subject: Fall back to glob.glob() on Python 2.4 glob.iglob() was introduced with Python 2.5, but pyinotify claims compatibility with Python 2.4. Here, we fall back to glob.glob() if iglob() isn't available. --- python2/pyinotify.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python2/pyinotify.py b/python2/pyinotify.py index aa9c148..7d6b05f 100755 --- a/python2/pyinotify.py +++ b/python2/pyinotify.py @@ -68,7 +68,6 @@ from datetime import datetime, timedelta import time import re import asyncore -import glob import subprocess try: @@ -76,6 +75,12 @@ try: except ImportError: pass # Will fail on Python 2.4 which has reduce() builtin anyway. +try: + from glob import iglob as glob +except ImportError: + # Python 2.4 does not have glob.iglob(). + from glob import glob as glob + try: import ctypes import ctypes.util @@ -1830,7 +1835,7 @@ class WatchManager: def __glob(self, path, do_glob): if do_glob: - return glob.iglob(path) + return glob(path) else: return [path] -- cgit v1.2.1