From 47d68b3c4e80a0bdf1e0ff2184f4f3efd029221b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 31 Aug 2020 14:50:16 +0100 Subject: [PATCH] Remove trailing spaces from search string --- daemon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index 689176492..ef3b18f0f 100644 --- a/daemon.py +++ b/daemon.py @@ -2196,7 +2196,7 @@ class PubServer(BaseHTTPRequestHandler): searchStr = searchStr.split('&')[0] searchStr = \ urllib.parse.unquote_plus(searchStr.strip()) - searchStr2 = searchStr.lower().strip('\n').strip('\r') + searchStr = searchStr.lower().strip() print('searchStr: ' + searchStr) if searchForEmoji: searchStr = ':' + searchStr + ':' @@ -2324,11 +2324,11 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return elif (searchStr.startswith(':') or - searchStr2.endswith(' emoji')): + searchStr.endswith(' emoji')): # eg. "cat emoji" - if searchStr2.endswith(' emoji'): + if searchStr.endswith(' emoji'): searchStr = \ - searchStr2.replace(' emoji', '') + searchStr.replace(' emoji', '') # emoji search emojiStr = \ htmlSearchEmoji(self.server.translate,