finn/dominiontabs
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Python 3 Compatibility (#208)

Browse Source 
* make python3 compatible; clean up test reqs a bit
This commit is contained in:
Peter authored and GitHub committed 2018-07-30 12:03:36 -07:00
1 parent 780f2fc28d
commit bea714dfb8
29 files changed
+11664 -11663
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/add_language.py
+13 -11
View File
@@ -1,3 +1,4 @@
from __future__ import print_function
import os
import codecs
import json
@@ -16,16 +17,16 @@ crossReference = "./CrossReference"
if len(sys.argv) > 1:
LANGUAGE_NEW = sys.argv[1].strip().lower()
else:
print "Usage: ", sys.argv[0], " xx"
print "where xx is the two letter language abreviation."
print("Usage: ", sys.argv[0], " xx")
print("where xx is the two letter language abreviation.")
sys.exit()
def unicode_csv_reader(utf8_data, dialect=csv.excel, **kwargs):
csv_reader = csv.reader(utf8_data, dialect=dialect, **kwargs)
for row in csv_reader:
yield [unicode(cell, 'iso-8859-15') for cell in row]
#yield [unicode(cell, 'iso-8859-1') for cell in row]
#yield [cell.decode('iso-8859-1').encode('utf8') for cell in row]
yield [cell.decode('iso-8859-15') for cell in row]
def get_json_data(json_file_path):
# Read in the json from the specified file
@@ -43,12 +44,14 @@ def json_dict_entry(entry, separator=''):
'{}').rstrip() # Remove outer{} and then trailing whitespace
return separator + json_data
def find_index(items, find):
if find in items:
return items.index(find)
else:
return None
reader = unicode_csv_reader(open(crossReference + '.csv'))
cards = list(reader)
headers = cards[0]
@@ -70,8 +73,8 @@ lang_index = find_index(headers, LANGUAGE_NEW)
card_index = find_index(headers, 'card_tag')
if lang_index is None or card_index is None:
print "Cound not find new language '",LANGUAGE_NEW, "' in the CrossReference file"
print "Files copied, but no name changes were made."
print("Cound not find new language '", LANGUAGE_NEW, "' in the CrossReference file")
print("Files copied, but no name changes were made.")
sys.exit()
# Get the new names for those in the CrossReference
@@ -85,7 +88,7 @@ fname = os.path.join(card_db_dir, LANGUAGE_XX, "cards_" + LANGUAGE_XX + ".json")
if os.path.isfile(fname):
lang_data = get_json_data(fname)
else:
print "ERROR: Failed to open :", fname
print("ERROR: Failed to open :", fname)
sys.exit()
if cardlist:
@@ -93,10 +96,9 @@ if cardlist:
os.path.join(output_dir, LANGUAGE_NEW, "cards_" + LANGUAGE_NEW + ".json"), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("{")) # Start of set
lang_out.write("{") # Start of set
sep = ""
for card in lang_data:
# print card, lang_data[card]
data = lang_data[card]
@@ -107,4 +109,4 @@ if cardlist:
data['untranslated'] = ', '.join(fields)
lang_out.write(json_dict_entry({card: data}, sep))
sep = ","
lang_out.write(unicode("\n}\n")) # End of Set
lang_out.write("\n}\n") # End of Set
tools/convert_csv.py
+2 -2
View File
@@ -1,8 +1,8 @@
# coding=utf-8
from __future__ import print_function
import csv
import sys
import json
import chardet
converted = []
@@ -26,7 +26,7 @@ with open(sys.argv[1], 'U') as csvfile:
if not row['Typ']:
continue
# row = {k: v.decode('ISO-8859-2').encode('utf-8') if type(v) == str else v for k, v in row.iteritems()}
#print chardet.detect(row['Kartentext'])
# print chardet.detect(row['Kartentext'])
if 'Ritter' in row['Typ'] and row['Kartenname'] != 'Ritter':
continue
converted_row = {'name': row['Kartenname'],
tools/update_language.py
+33 -41
View File
@@ -10,6 +10,7 @@
#
# All output is in the designated output directory. Original files are not overwritten.
###########################################################################
from __future__ import print_function
import os
import os.path
import io
@@ -18,6 +19,8 @@ import json
from shutil import copyfile
import argparse
import six
LANGUAGE_DEFAULT = 'en_us' # default language, which takes priority
LANGUAGE_XX = 'xx' # language for starting a translation
@@ -36,7 +39,7 @@ def get_lang_dirs(path):
def get_json_data(json_file_path):
print('reading {}'.format(json_file_path))
print(('reading {}'.format(json_file_path)))
# Read in the json from the specified file
with codecs.open(json_file_path, 'r', 'utf-8') as json_file:
data = json.load(json_file)
@@ -57,19 +60,9 @@ def json_dict_entry(entry, separator=''):
# see: http://stackoverflow.com/questions/1143671/python-sorting-list-of-dictionaries-by-multiple-keys
def multikeysort(items, columns):
from operator import itemgetter
comparers = [((itemgetter(col[1:].strip()), -1)
if col.startswith('-') else (itemgetter(col.strip()), 1))
for col in columns]
def comparer(left, right):
for fn, mult in comparers:
result = cmp(fn(left), fn(right))
if result:
return mult * result
else:
return 0
return sorted(items, cmp=comparer)
for c in columns[::-1]:
items = sorted(items, key=itemgetter(c))
return items
def main(args):
@@ -81,9 +74,9 @@ def main(args):
languages.insert(0, LANGUAGE_DEFAULT)
if LANGUAGE_XX not in languages:
languages.append(LANGUAGE_XX)
print "Languages:"
print languages
print
print("Languages:")
print(languages)
print()
###########################################################################
# Make sure the directories exist to hold the output
@@ -116,7 +109,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, "types_db.json"), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("[")) # Start of list
lang_out.write(six.u("[")) # Start of list
sep = ""
for type in sorted_type_data:
# Collect all the individual types
@@ -124,12 +117,12 @@ def main(args):
lang_out.write(sep + json.dumps(
type, indent=4, ensure_ascii=False, sort_keys=True))
sep = ","
lang_out.write(unicode("\n]\n")) # End of List
lang_out.write(six.u("\n]\n")) # End of List
type_parts.sort()
print "Unique Types:"
print type_parts
print
print("Unique Types:")
print(type_parts)
print()
###########################################################################
# Fix up all the xx/types_xx.json files
@@ -151,7 +144,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, lang, lang_file), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("{")) # Start of types
lang_out.write(six.u("{")) # Start of types
sep = ""
used = []
@@ -176,7 +169,7 @@ def main(args):
}, sep))
sep = ","
lang_out.write(unicode("\n}\n")) # End of Types
lang_out.write(six.u("\n}\n")) # End of Types
if lang == LANGUAGE_DEFAULT:
lang_type_default = lang_type_data # Keep for later languages
@@ -207,7 +200,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, "cards_db.json"), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("[")) # Start of list
lang_out.write(six.u("[")) # Start of list
sep = ""
for card in sorted_card_data:
if card['card_tag'] not in cards:
@@ -218,14 +211,14 @@ def main(args):
lang_out.write(sep + json.dumps(
card, indent=4, ensure_ascii=False, sort_keys=True))
sep = ","
lang_out.write(unicode("\n]\n")) # End of List
lang_out.write(six.u("\n]\n")) # End of List
cards.extend(groups)
cards.extend(super_groups)
print "Cards:"
print cards
print
print("Cards:")
print(cards)
print()
###########################################################################
# Fix up all the cards_xx.json files
@@ -250,7 +243,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, lang, lang_file), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("{")) # Start of set
lang_out.write(six.u("{")) # Start of set
sep = ""
fields = [u"description", u"extra", u"name"]
@@ -310,7 +303,7 @@ def main(args):
"untranslated"] = "Note: This card is currently not used."
lang_out.write(json_dict_entry({key: lang_data[key]}, sep))
sep = ","
lang_out.write(unicode("\n}\n")) # End of Set
lang_out.write(six.u("\n}\n")) # End of Set
if lang == LANGUAGE_DEFAULT:
lang_default = lang_data # Keep for later languages
@@ -325,7 +318,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, lang_file), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("{")) # Start of set
lang_out.write(six.u("{")) # Start of set
sep = ""
sets = []
for s in sorted(set_data):
@@ -334,11 +327,11 @@ def main(args):
if s not in sets:
sets.append(s)
lang_out.write(unicode("\n}\n")) # End of Set
lang_out.write(six.u("\n}\n")) # End of Set
print "Sets:"
print sets
print
print("Sets:")
print(sets)
print()
###########################################################################
# Fix up all the xx/sets_xx.json files
@@ -359,7 +352,7 @@ def main(args):
with io.open(
os.path.join(args.output_dir, lang, lang_file), 'w',
encoding='utf-8') as lang_out:
lang_out.write(unicode("{")) # Start of set
lang_out.write(six.u("{")) # Start of set
sep = ""
for s in sorted(set_data):
@@ -402,7 +395,7 @@ def main(args):
lang_out.write(json_dict_entry({key: lang_set_data[key]}, sep))
sep = ","
lang_out.write(unicode("\n}\n")) # End of Set
lang_out.write(six.u("\n}\n")) # End of Set
if lang == LANGUAGE_DEFAULT:
lang_default = lang_set_data # Keep for later languages
@@ -437,11 +430,10 @@ def main(args):
if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument('--card_db_dir', default=os.path.join(os.path.dirname(os.path.abspath(__file__)),
"..", "domdiv", "card_db"),
"..", "domdiv", "card_db"),
help='directory of card data')
parser.add_argument('--output_dir',
parser.add_argument('--output_dir',
default=os.path.join(os.path.dirname(os.path.abspath(__file__)), ".", "card_db"),
help='directory for output data')
args = parser.parse_args()
main(args)