From: realraum Date: Mon, 13 Jun 2011 23:20:04 +0000 (+0000) Subject: case insensitive regular expression X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=200482214edd25b017280a2f58bc87d52dbe2678;p=svn42.git case insensitive regular expression --- diff --git a/track-presence.py b/track-presence.py index f9bdaa4..716b34c 100755 --- a/track-presence.py +++ b/track-presence.py @@ -149,9 +149,9 @@ threads_running=True def trackSensorStatusThread(uwscfg,status_tracker,connection_listener): global sshp, threads_running #RE_TEMP = re.compile(r'temp\d: (\d+\.\d+)') - RE_PHOTO = re.compile(r'photo\d: [^0-9]*?(\d+)') - RE_MOVEMENT = re.compile(r'movement|button\d?|PanicButton') - RE_ERROR = re.compile(r'Error: (.+)') + RE_PHOTO = re.compile(r'photo\d: [^0-9]*?(\d+)',re.I) + RE_MOVEMENT = re.compile(r'movement|button\d?|PanicButton',re.I) + RE_ERROR = re.compile(r'Error: (.+)',re.I) while threads_running: uwscfg.checkConfigUpdates() sshp = None @@ -213,9 +213,9 @@ door_socklock=threading.Lock() def trackDoorStatusThread(uwscfg, status_tracker,connection_listener): global door_sockhandle, door_socklock, threads_running #socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well) - RE_STATUS = re.compile(r'Status: (\w+), idle') - RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)') - RE_ERROR = re.compile(r'Error: (.+)') + RE_STATUS = re.compile(r'Status: (\w+), idle',re.I) + RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)',re.I) + RE_ERROR = re.compile(r'Error: (.+)',re.I) while threads_running: uwscfg.checkConfigUpdates() with door_socklock: