PEP8 (andiwand#4)

* PEP8 linting

* add a travis ci linting

* Drop Python 3.4, add 3.8 support

This lxml version requires Python 2.7, 3.5 or later.

Author: keachi

.travis.yml

@@ -0,0 +1,27 @@
+---
+language: python
+
+python:
+  - "2.7"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+
+cache:
+  pip: true
+
+before_install:
+  - python --version
+  - pip install -U pip
+
+install:
+  - pip install ".[test]" .
+
+script:
+  - pycodestyle .
+
+after_success:
+  - codecov
+
+# vim: set ts=2 sw=2 :

leo/leo.py

@@ -10,23 +10,25 @@
 from bs4 import BeautifulSoup
 
 COUNTRY_CODES = {
-    'en',
-    'de',
-    'fr',
-    'es',
+    "en",
+    "de",
+    "fr",
+    "es",
 }
 LANGUAGES = {
-    'en': 'English',
-    'de': 'German',
-    'fr': 'French',
-    'es': 'Spanish',
+    "en": "English",
+    "de": "German",
+    "fr": "French",
+    "es": "Spanish",
 }
 
-URL = "http://dict.leo.org/dictQuery/m-vocab/{0}/query.xml" \
-      "?tolerMode=nof&lp={0}&lang=de&rmWords=off&rmSearch=on" \
-      "&search={1}&searchLoc=0&resultOrder=basic" \
-      "&multiwordShowSingle=on"
-URL_PRONOUNCE = 'http://dict.leo.org/media/audio/{0}.mp3'
+URL = (
+    "http://dict.leo.org/dictQuery/m-vocab/{0}/query.xml"
+    "?tolerMode=nof&lp={0}&lang=de&rmWords=off&rmSearch=on"
+    "&search={1}&searchLoc=0&resultOrder=basic"
+    "&multiwordShowSingle=on"
+)
+URL_PRONOUNCE = "http://dict.leo.org/media/audio/{0}.mp3"
 
 
 def similarity(s1, s2):
@@ -36,8 +38,8 @@ def similarity(s1, s2):
 def fetch(phrase, lang):
     url = URL.format(lang, phrase)
     r = requests.get(url)
-    soup = BeautifulSoup(r.text, 'xml')
-    return soup.find_all('entry')
+    soup = BeautifulSoup(r.text, "xml")
+    return soup.find_all("entry")
 
 
 def pronounce(phrase, lang):
@@ -46,11 +48,11 @@ def pronounce(phrase, lang):
         return None
     result = []
     for entry in entries:
-        for side in entry.find_all('side', lang='en'):
-            word = side.find('word').get_text()
-            if not side.find('pron'):
+        for side in entry.find_all("side", lang="en"):
+            word = side.find("word").get_text()
+            if not side.find("pron"):
                 continue
-            url = side.find('pron')['url']
+            url = side.find("pron")["url"]
             result.append((word, url))
     if not result:
         return False
@@ -67,20 +69,24 @@ def translate(phrase, lang):
     if not entries:
         return None
 
-    return [tuple([side.find('word').get_text()
-                  for side in entry.find_all('side')])
-            for entry in entries]
+    return [
+        tuple([
+            side.find("word").get_text() for side in entry.find_all("side")
+        ])
+        for entry in entries
+    ]
 
 
 def play(url):
     try:
         import vlc
+
         player = vlc.MediaPlayer(url)
         player.play()
         while player.get_state() not in (
-                vlc.State.Stopped,
-                vlc.State.Ended,
-                vlc.State.Error,
+            vlc.State.Stopped,
+            vlc.State.Ended,
+            vlc.State.Error,
         ):
             time.sleep(0.1)
         player.stop()
@@ -90,41 +96,44 @@ def play(url):
 
 def main(argv=None):
     parser = argparse.ArgumentParser(
-        description='leo dict cli',
+        description="leo dict cli",
     )
     parser.add_argument(
-        '-l',
-        '--language',
+        "-l",
+        "--language",
         help='destination language (default is "%(default)s")',
-        default='en',
+        default="en",
+    )
+    parser.add_argument(
+        "-p",
+        "--pronounce",
+        help="pronounce phrase",
+        action="store_true",
     )
     parser.add_argument(
-        '-p',
-        '--pronounce',
-        help='pronounce phrase',
-        action='store_true',
+        "phrase",
+        help="phrase to translate",
     )
-    parser.add_argument('phrase', help='phrase to translate')
     args = parser.parse_args(argv)
 
-    phrase, lang = args.phrase, args.language + 'de'
+    phrase, lang = args.phrase, args.language + "de"
 
     if args.pronounce:
         result = pronounce(phrase, lang)
         return 0 if result else 1
 
     translations = translate(phrase, lang)
     if not translations:
-        print('no translation found')
+        print("no translation found")
         return 1
 
     for trans in translations:
-        print('%s\t\t%s' % trans)
+        print("%s\t\t%s" % trans)
 
     return 0
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     rcode = main()
     sys.exit(rcode)
 

leo/train.py

@@ -11,26 +11,29 @@
 
 def main(argv=None):
     parser = argparse.ArgumentParser(
-        description='pronunciation training',
+        description="pronunciation training",
     )
     parser.add_argument(
-        '-s',
-        '--sequential',
-        help='sequential order',
-        action='store_true',
+        "-s",
+        "--sequential",
+        help="sequential order",
+        action="store_true",
     )
     parser.add_argument(
-        '-p',
-        '--pronounce',
-        help='pronounce word',
-        action='store_true',
+        "-p",
+        "--pronounce",
+        help="pronounce word",
+        action="store_true",
+    )
+    parser.add_argument(
+        "file",
+        help="word list",
     )
-    parser.add_argument('file', help='word list')
     args = parser.parse_args(argv)
 
-    lang = 'ende'
+    lang = "ende"
 
-    with open(args.file, 'r') as f:
+    with open(args.file, "r") as f:
         words = [line.strip() for line in f.readlines() if line.strip()]
     if not args.sequential:
         random.shuffle(words)
@@ -39,7 +42,7 @@ def main(argv=None):
         sys.stdout.write(word)
         input()
 
-        subs = [sub.strip() for sub in word.split('/')]
+        subs = [sub.strip() for sub in word.split("/")]
         for sub in subs:
             subs_len = len(subs)
             if subs_len > 1:
@@ -59,7 +62,7 @@ def main(argv=None):
     return 0
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     exit = main()
     sys.exit(exit)
 

setup.py

@@ -1,35 +1,40 @@
 from setuptools import find_packages, setup
 
 setup(
-    name='leo',
-    version='1.1',
-    description='dict.leo.org',
-    long_description='Leo Dictionary',
+    name="leo",
+    version="1.1",
+    description="dict.leo.org",
+    long_description="Leo Dictionary",
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6'
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: POSIX :: Linux",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
-    keywords='leo',
-    author='Andreas Stefl',
-    author_email='[email protected]',
-    url='https://github.com/andiwand/pyleo',
-    license='GPLv3',
+    keywords="leo",
+    author="Andreas Stefl",
+    author_email="[email protected]",
+    url="https://github.com/andiwand/pyleo",
+    license="GPLv3",
     packages=find_packages(),
     install_requires=[
-        'beautifulsoup4>=4.3.0',
-        'requests>=1.2.3',
-        'lxml>=4.1.1',
+        "beautifulsoup4>=4.3.0",
+        "requests>=1.2.3",
+        "lxml>=4.1.1",
     ],
     extras_require={
+        "test": [
+            "pycodestyle",
+            "codecov",
+        ]
     },
     entry_points="""
     [console_scripts]
     leo=leo.leo:main
     train=leo.train:main
-    """
+    """,
 )