From ad13fffb0727d3b1c6fe5f46944094b2d4b7bfaa Mon Sep 17 00:00:00 2001 From: Graham Eades Date: Tue, 3 Mar 2020 11:43:50 +0000 Subject: [PATCH] Tidy up key test --- scripts/builder/frontendBuilder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index 1094112..e19fe36 100755 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py @@ -288,7 +288,7 @@ class FrontendBuilder(object): def bookmarklet (self): cacheKey = 'bookmarklet' # if not self.processedFiles.has_key(cacheKey): - if 'bookmarklet' not in self.processedFiles: + if cacheKey not in self.processedFiles: result = 'bookmarklet="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet.js']), "regular") + '";bookmarklet_ie="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet_IE.js']), "IE") + '";' self.processedFiles[cacheKey] = result else: @@ -318,7 +318,7 @@ class FrontendBuilder(object): def assembleCopyrightHeader (self): processedFile = 'copyright' # if not self.processedFiles.has_key(processedFile): - if 'copyright' not in self.processedFiles: + if processedFile not in self.processedFiles: #self.log("assembling copyright header") copyrightValues = self.settings['copyright.values'] license = self.loadFilesContent('../../properties', ['license.txt'])