opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Set version to 2.15.1-SNAPSHOT
  Fix removal of email/password on external ID update
  PG: Make convert_for_template_tests.py compatible with Python 3

Change-Id: I123406081e5f4c0b45950978b468a507149e51af
This commit is contained in:
David Pursehouse
2018-03-30 14:59:22 +01:00
committed by Paladox
parent 273a0d9a9b 2f1e39e362
commit 9b68472833
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
polygerrit-ui/app/template_test_srcs/convert_for_template_tests.py
View File

@@ -10,26 +10,32 @@ fnCompiledRegex = re.compile(removeSelfInvokeRegex, re.DOTALL)
regexBehavior = r"<script>(.+)<\/script>" regexBehavior = r"<script>(.+)<\/script>"
behaviorCompiledRegex = re.compile(regexBehavior, re.DOTALL) behaviorCompiledRegex = re.compile(regexBehavior, re.DOTALL)
def _open(filename, mode="r"):
try:
return open(filename, mode, encoding="utf-8")
except TypeError:
return open(filename, mode)
def replaceBehaviorLikeHTML (fileIn, fileOut): def replaceBehaviorLikeHTML (fileIn, fileOut):
with open(fileIn) as f: with _open(fileIn) as f:
file_str = f.read() file_str = f.read()
match = behaviorCompiledRegex.search(file_str) match = behaviorCompiledRegex.search(file_str)
if (match): if (match):
with open("polygerrit-ui/temp/behaviors/" + fileOut.replace("html", "js") , "w+") as f: with _open("polygerrit-ui/temp/behaviors/" + fileOut.replace("html", "js") , "w+") as f:
f.write(match.group(1)) f.write(match.group(1))
def replaceBehaviorLikeJS (fileIn, fileOut): def replaceBehaviorLikeJS (fileIn, fileOut):
with open(fileIn) as f: with _open(fileIn) as f:
file_str = f.read() file_str = f.read()
with open("polygerrit-ui/temp/behaviors/" + fileOut , "w+") as f: with _open("polygerrit-ui/temp/behaviors/" + fileOut , "w+") as f:
f.write(file_str) f.write(file_str)
def generateStubBehavior(behaviorName): def generateStubBehavior(behaviorName):
with open("polygerrit-ui/temp/behaviors/" + behaviorName + ".js", "w+") as f: with _open("polygerrit-ui/temp/behaviors/" + behaviorName + ".js", "w+") as f:
f.write("/** @polymerBehavior **/\n" + behaviorName + "= {};") f.write("/** @polymerBehavior **/\n" + behaviorName + "= {};")
def replacePolymerElement (fileIn, fileOut, root): def replacePolymerElement (fileIn, fileOut, root):
with open(fileIn) as f: with _open(fileIn) as f:
key = fileOut.split('.')[0] key = fileOut.split('.')[0]
# Removed self invoked function # Removed self invoked function
file_str = f.read() file_str = f.read()
@@ -38,7 +44,7 @@ def replacePolymerElement (fileIn, fileOut, root):
if file_str_no_fn: if file_str_no_fn:
package = root.replace("/", ".") + "." + fileOut package = root.replace("/", ".") + "." + fileOut
with open("polygerrit-ui/temp/" + fileOut, "w+") as f: with _open("polygerrit-ui/temp/" + fileOut, "w+") as f:
mainFileContents = re.sub(polymerCompiledRegex, "exports = Polymer({", file_str_no_fn.group(1)).replace("'use strict';", "") mainFileContents = re.sub(polymerCompiledRegex, "exports = Polymer({", file_str_no_fn.group(1)).replace("'use strict';", "")
f.write("/** \n" \ f.write("/** \n" \
"* @fileoverview \n" \ "* @fileoverview \n" \
@@ -95,7 +101,7 @@ if __name__ == "__main__":
#TODO figure out something to do with iron-overlay-behavior. it is hard-coded reformatted. #TODO figure out something to do with iron-overlay-behavior. it is hard-coded reformatted.
with open("polygerrit-ui/temp/map.json", "w+") as f: with _open("polygerrit-ui/temp/map.json", "w+") as f:
f.write(json.dumps(elements)) f.write(json.dumps(elements))
for root, dirs, files in os.walk("polygerrit-ui/app/behaviors"): for root, dirs, files in os.walk("polygerrit-ui/app/behaviors"):