From 5c29e2522185366308dc4db4067c7d3205cd34b1 Mon Sep 17 00:00:00 2001 From: Yuan Chen Date: Tue, 1 Sep 2020 13:16:45 -0700 Subject: [PATCH] Remove trailing whitespace --- tools/addword.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/addword.py b/tools/addword.py index 7ac733c..48c12ac 100755 --- a/tools/addword.py +++ b/tools/addword.py @@ -16,33 +16,34 @@ def main(): sys.exit(1) word = sys.argv[1] pronunciations = get_pronunciations(word) - britsh_en = '[🔊](' + pronunciations[0][0] +')' + ' ' + pronunciations[0][1] - american_en = '[🔊](' + pronunciations[1][0] +')' + ' ' + pronunciations[1][1] + britsh_en = '[🔊](' + pronunciations[0][0] +')' + ' ' + '/' + pronunciations[0][1] + '/' + american_en = '[🔊](' + pronunciations[1][0] +')' + ' ' + '/' + pronunciations[1][1] + '/' line = '| ' + word + ' | ' + britsh_en + ' | ' + american_en + ' | ' + ' ' + '|' print(line) def get_pronunciations(word): - """Return the word's pronouciation URLs and phonetic transcriptions + """Return the word's pronouciation URLs and phonetic transcriptions from youdao.com if available""" word = word.strip() word_url = "http://dict.youdao.com/w/en/"+word - britsh_en = [" ", "/ /"] - american_en = [" ","/ /"] + pron_url = "http://dict.youdao.com/dictvoice?audio="+word+"&" + britsh_en = [" ", " "] + american_en = [" "," "] try: response = urllib.request.urlopen(word_url).read() soup = BeautifulSoup(response, "html.parser") spans = soup.find_all('span', {'class' : 'pronounce'}) lines = [span.get_text() for span in spans] match = re.findall(r'\[.+\]', lines[0]) - britsh_en[0] = "http://dict.youdao.com/dictvoice?audio="+word+"&type=1" - britsh_en[1] = match[0].replace('[', '/').replace(']', '/') + britsh_en[0] = pron_url + "type=1" + britsh_en[1] = match[0].replace('[', '').replace(']', '') match = re.findall(r'\[.+\]', lines[1]) - american_en[0] = "http://dict.youdao.com/dictvoice?audio="+word+"&type=2" - american_en[1] = match[0].replace('[', '/').replace(']', '/') + american_en[0] = pron_url + "type=2" + american_en[1] = match[0].replace('[', '').replace(']', '') except: - return britsh_en, american_en + return britsh_en, american_en - return britsh_en, american_en + return britsh_en, american_en if __name__ == '__main__': main()