clipperz
/
password-manager-mirror
mirror of http://git.whoc.org.uk/git/password-manager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tidy up key test

master v1.1.0
Graham Eades 2020-03-03 11:43:50 +00:00
parent 1f38736b37
commit ad13fffb07
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/builder/frontendBuilder.py
View File

@ -288,7 +288,7 @@ class FrontendBuilder(object):
def bookmarklet (self): def bookmarklet (self):
cacheKey = 'bookmarklet' cacheKey = 'bookmarklet'
# if not self.processedFiles.has_key(cacheKey): # 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") + '";' 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 self.processedFiles[cacheKey] = result
else: else:
@ -318,7 +318,7 @@ class FrontendBuilder(object):
def assembleCopyrightHeader (self): def assembleCopyrightHeader (self):
processedFile = 'copyright' processedFile = 'copyright'
# if not self.processedFiles.has_key(processedFile): # if not self.processedFiles.has_key(processedFile):
if 'copyright' not in self.processedFiles: if processedFile not in self.processedFiles:
#self.log("assembling copyright header") #self.log("assembling copyright header")
copyrightValues = self.settings['copyright.values'] copyrightValues = self.settings['copyright.values']
license = self.loadFilesContent('../../properties', ['license.txt']) license = self.loadFilesContent('../../properties', ['license.txt'])