Loading tools/stringslint/stringslint.py +5 −7 Original line number Diff line number Diff line #!/usr/bin/env python #!/usr/bin/env python3 #-*- coding: utf-8 -*- # Copyright (C) 2018 The Android Open Source Project # Loading Loading @@ -33,9 +34,6 @@ In general: import re, sys, codecs import lxml.etree as ET reload(sys) sys.setdefaultencoding('utf8') BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) def format(fg=None, bg=None, bright=False, bold=False, dim=False, reset=False): Loading Loading @@ -118,7 +116,7 @@ def lint(path): raw = f.read() if len(raw.strip()) == 0: return warnings tree = ET.fromstring(raw) tree = ET.fromstring(bytes(raw, encoding='utf-8')) root = tree #tree.getroot() last_comment = None Loading Loading @@ -231,6 +229,6 @@ for b in before: if len(after) > 0: for a in sorted(after.keys()): print after[a] print print(after[a]) print() sys.exit(1) tools/stringslint/stringslint_sha.sh +1 −1 Original line number Diff line number Diff line #!/bin/bash LOCAL_DIR="$( dirname ${BASH_SOURCE} )" git show --name-only --pretty=format: $1 | grep values/strings.xml | while read file; do python $LOCAL_DIR/stringslint.py <(git show $1:$file) <(git show $1^:$file) python3 $LOCAL_DIR/stringslint.py <(git show $1:$file) <(git show $1^:$file) done Loading
tools/stringslint/stringslint.py +5 −7 Original line number Diff line number Diff line #!/usr/bin/env python #!/usr/bin/env python3 #-*- coding: utf-8 -*- # Copyright (C) 2018 The Android Open Source Project # Loading Loading @@ -33,9 +34,6 @@ In general: import re, sys, codecs import lxml.etree as ET reload(sys) sys.setdefaultencoding('utf8') BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) def format(fg=None, bg=None, bright=False, bold=False, dim=False, reset=False): Loading Loading @@ -118,7 +116,7 @@ def lint(path): raw = f.read() if len(raw.strip()) == 0: return warnings tree = ET.fromstring(raw) tree = ET.fromstring(bytes(raw, encoding='utf-8')) root = tree #tree.getroot() last_comment = None Loading Loading @@ -231,6 +229,6 @@ for b in before: if len(after) > 0: for a in sorted(after.keys()): print after[a] print print(after[a]) print() sys.exit(1)
tools/stringslint/stringslint_sha.sh +1 −1 Original line number Diff line number Diff line #!/bin/bash LOCAL_DIR="$( dirname ${BASH_SOURCE} )" git show --name-only --pretty=format: $1 | grep values/strings.xml | while read file; do python $LOCAL_DIR/stringslint.py <(git show $1:$file) <(git show $1^:$file) python3 $LOCAL_DIR/stringslint.py <(git show $1:$file) <(git show $1^:$file) done