Sourcery refactored master branch

days/009-012-modern-apis-starred/demo/app.py

@@ -14,13 +14,9 @@ def _load_cars_data():
 
 
 cars = _load_cars_data()
-VALID_MANUFACTURERS = set([car["manufacturer"]
-                          for car in cars.values()])
+VALID_MANUFACTURERS = {car["manufacturer"] for car in cars.values()}
 CAR_NOT_FOUND = 'Car not found'
 
-# definition
-
-
 class Car(types.Type):
     id = validators.Integer(allow_null=True)  # assign in POST
     manufacturer = validators.String(enum=list(VALID_MANUFACTURERS))

days/009-012-modern-apis-starred/demo/test_app.py

@@ -52,7 +52,7 @@ def test_create_car():
 def test_create_car_after_delete():
     """Test to fail create_car's len(cars)+1 (fix max(cars.keys())+1)"""
     car_count = len(cars)
-    response = client.delete(f'/99/')
+    response = client.delete('/99/')
     assert response.status_code == 204
     assert len(cars) == car_count - 1
     data = {'manufacturer': 'Honda',

days/017-020-flask-call-apis/code/program/routes.py

@@ -5,7 +5,7 @@
 
 from program import app
 
-time_now = str(datetime.today())
+time_now = str(datetime.now())
 
 
 @app.route('/')
@@ -43,11 +43,6 @@ def get_chuck_joke():
 
 
 def get_poke_colours(colour):
-    r = requests.get('https://pokeapi.co/api/v2/pokemon-color/' + colour.lower())
+    r = requests.get(f'https://pokeapi.co/api/v2/pokemon-color/{colour.lower()}')
     pokedata = r.json()
-    pokemon = []
-
-    for i in pokedata['pokemon_species']:
-        pokemon.append(i['name'])
-
-    return pokemon
+    return [i['name'] for i in pokedata['pokemon_species']]

days/021-024-quart-async/async_cityscape_api/app.py

@@ -21,7 +21,7 @@ def configure_app():
     services.sun_service.use_cached_data = data.get('use_cached_data', False)
     services.location_service.use_cached_data = True
 
-    print("Using cached data? {}".format(data.get('use_cached_data', False)))
+    print(f"Using cached data? {data.get('use_cached_data', False)}")
 
 
 def run_web_app():

days/021-024-quart-async/async_cityscape_api/services/location_service.py

@@ -30,5 +30,5 @@ async def get_lat_long(zip_code: str, country: str) -> Tuple[float, float]:
                 resp.raise_for_status()
                 data = await resp.json()
 
-        city_data = data.get(f'{zip_code}, {country}', dict())
+        city_data = data.get(f'{zip_code}, {country}', {})
         return city_data.get('latitude', 0.00), city_data.get('longitude', 0.00)

days/021-024-quart-async/cityscape_api/app.py

@@ -23,7 +23,7 @@ def configure_app():
     # Sadly, datasciencetoolkit.org seems to have gone out of existence.
     services.location_service.use_cached_data = True
 
-    print("Using cached data? {}".format(data.get('use_cached_data', False)))
+    print(f"Using cached data? {data.get('use_cached_data', False)}")
 
 
 def run_web_app():

days/021-024-quart-async/cityscape_api/services/location_service.py

@@ -23,5 +23,5 @@ def get_lat_long(zip_code: str, country: str) -> Tuple[float, float]:
 
         data = resp.json()
 
-        city_data = data.get(f'{zip_code}, {country}', dict())
+        city_data = data.get(f'{zip_code}, {country}', {})
         return city_data.get('latitude', 0.00), city_data.get('longitude', 0.00)

days/021-024-quart-async/python_async/async_program.py

@@ -6,7 +6,7 @@
 
 def main():
     t0 = datetime.datetime.now()
-    print(colorama.Fore.WHITE + "App started.", flush=True)
+    print(f"{colorama.Fore.WHITE}App started.", flush=True)
 
     # Changed from asyncio.get_event_loop() => asyncio.new_event_loop()
     # There has been a deprecation:
@@ -31,7 +31,7 @@ async def generate_data(num: int, data: asyncio.Queue):
         item = idx*idx
         await data.put((item, datetime.datetime.now()))
 
-        print(colorama.Fore.YELLOW + f" -- generated item {idx}", flush=True)
+        print(f"{colorama.Fore.YELLOW} -- generated item {idx}", flush=True)
         await asyncio.sleep(random.random() + .5)
 
 

days/021-024-quart-async/python_async/sync_program.py

@@ -6,7 +6,7 @@
 
 def main():
     t0 = datetime.datetime.now()
-    print(colorama.Fore.WHITE + "App started.", flush=True)
+    print(f"{colorama.Fore.WHITE}App started.", flush=True)
     data = []
     generate_data(20, data)
     process_data(20, data)
@@ -20,7 +20,7 @@ def generate_data(num: int, data: list):
         item = idx*idx
         data.append((item, datetime.datetime.now()))
 
-        print(colorama.Fore.YELLOW + f" -- generated item {idx}", flush=True)
+        print(f"{colorama.Fore.YELLOW} -- generated item {idx}", flush=True)
         time.sleep(random.random() + .5)
 
 

days/021-024-quart-async/your_turn/day_2/web_crawl/program.py

@@ -4,7 +4,7 @@
 
 
 def get_html(episode_number: int) -> str:
-    print(Fore.YELLOW + f"Getting HTML for episode {episode_number}", flush=True)
+    print(f"{Fore.YELLOW}Getting HTML for episode {episode_number}", flush=True)
 
     url = f'https://talkpython.fm/{episode_number}'
     resp = requests.get(url)
@@ -14,13 +14,10 @@ def get_html(episode_number: int) -> str:
 
 
 def get_title(html: str, episode_number: int) -> str:
-    print(Fore.CYAN + f"Getting TITLE for episode {episode_number}", flush=True)
+    print(f"{Fore.CYAN}Getting TITLE for episode {episode_number}", flush=True)
     soup = bs4.BeautifulSoup(html, 'html.parser')
     header = soup.select_one('h1')
-    if not header:
-        return "MISSING"
-
-    return header.text.strip()
+    return "MISSING" if not header else header.text.strip()
 
 
 def main():
@@ -33,7 +30,7 @@ def get_title_range():
     for n in range(150, 170):
         html = get_html(n)
         title = get_title(html, n)
-        print(Fore.WHITE + f"Title found: {title}", flush=True)
+        print(f"{Fore.WHITE}Title found: {title}", flush=True)
 
 
 if __name__ == '__main__':

days/021-024-quart-async/your_turn/day_4/cityscape_api/app.py

@@ -23,7 +23,7 @@ def configure_app():
     # Sadly, datasciencetoolkit.org seems to have gone out of existence.
     services.location_service.use_cached_data = True
 
-    print("Using cached data? {}".format(data.get('use_cached_data', False)))
+    print(f"Using cached data? {data.get('use_cached_data', False)}")
 
 
 def run_web_app():

days/021-024-quart-async/your_turn/day_4/cityscape_api/services/location_service.py

@@ -28,5 +28,5 @@ def get_lat_long(zip_code: str, country: str) -> Tuple[float, float]:
 
         data = resp.json()
 
-        city_data = data.get(f'{zip_code}, {country}', dict())
+        city_data = data.get(f'{zip_code}, {country}', {})
         return city_data.get('latitude', 0.00), city_data.get('longitude', 0.00)

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/data/session_factory.py

@@ -14,7 +14,7 @@ def global_init(db_name: str):
     if __factory:
         return
 
-    conn_str = 'sqlite:///' + db_folder.get_full_path(db_name)
+    conn_str = f'sqlite:///{db_folder.get_full_path(db_name)}'
     __engine = sqlalchemy.create_engine(conn_str, echo=False)
     __factory = sqlalchemy.orm.sessionmaker(bind=__engine)
 

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/infrastructure/switchlang.py

@@ -53,7 +53,7 @@ def case(self, key, func: Callable[[], Any], fallthrough=False):
                 if not fallthrough:
                     self._falling_through = False
 
-        if isinstance(key, list) or isinstance(key, range):
+        if isinstance(key, (list, range)):
             found = False
             for i in key:
                 if self.case(i, func, fallthrough=None):
@@ -63,7 +63,7 @@ def case(self, key, func: Callable[[], Any], fallthrough=False):
             return found
 
         if key in self.cases:
-            raise ValueError("Duplicate case: {}".format(key))
+            raise ValueError(f"Duplicate case: {key}")
         if not func:
             raise ValueError("Action for case cannot be None.")
         if not callable(func):
@@ -85,8 +85,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             raise exc_val
 
         if not self._func_stack:
-            raise Exception("Value does not match any case and there "
-                            "is no default case: value {}".format(self.value))
+            raise Exception(
+                f"Value does not match any case and there is no default case: value {self.value}"
+            )
 
         for func in self._func_stack:
             # noinspection PyCallingNonCallable

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/program.py

@@ -41,7 +41,7 @@ def rent_a_scooter():
     scooters = find_available_scooters(True)
     chose_it = try_int(input('Which one do you want? ')) - 1
 
-    if not (0 <= chose_it or chose_it < len(scooters)):
+    if chose_it < 0 and chose_it >= len(scooters):
         print("Error: Pick another number.")
         return
 

days/033-036-sqlalchemy-orm/demo/hovershare_app_final/services/data_service.py

@@ -60,7 +60,7 @@ def rented_scooters() -> List[Scooter]:
     session = session_factory.create_session()
 
     # noinspection PyComparisonWithNone
-    scooters = session.query(Scooter).filter(Scooter.location_id == None).all()
+    scooters = session.query(Scooter).filter(Scooter.location_id is None).all()
 
     return list(scooters)
 

days/033-036-sqlalchemy-orm/demo/hovershare_app_starter/infrastructure/switchlang.py

@@ -53,7 +53,7 @@ def case(self, key, func: Callable[[], Any], fallthrough=False):
                 if not fallthrough:
                     self._falling_through = False
 
-        if isinstance(key, list) or isinstance(key, range):
+        if isinstance(key, (list, range)):
             found = False
             for i in key:
                 if self.case(i, func, fallthrough=None):
@@ -63,7 +63,7 @@ def case(self, key, func: Callable[[], Any], fallthrough=False):
             return found
 
         if key in self.cases:
-            raise ValueError("Duplicate case: {}".format(key))
+            raise ValueError(f"Duplicate case: {key}")
         if not func:
             raise ValueError("Action for case cannot be None.")
         if not callable(func):
@@ -85,8 +85,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             raise exc_val
 
         if not self._func_stack:
-            raise Exception("Value does not match any case and there "
-                            "is no default case: value {}".format(self.value))
+            raise Exception(
+                f"Value does not match any case and there is no default case: value {self.value}"
+            )
 
         for func in self._func_stack:
             # noinspection PyCallingNonCallable

days/033-036-sqlalchemy-orm/demo/hovershare_app_starter/program.py

@@ -39,7 +39,7 @@ def rent_a_scooter():
     scooters = find_available_scooters(True)
     chose_it = try_int(input('Which one do you want? ')) - 1
 
-    if not (0 <= chose_it or chose_it < len(scooters)):
+    if chose_it < 0 and chose_it >= len(scooters):
         print("Error: Pick another number.")
         return
 
@@ -51,10 +51,9 @@ def find_available_scooters(suppress_header=False):
     if not suppress_header:
         print("********* Available scooters: ********* ")
 
-    parked_scooters = []
     # todo show parked scooters
     print()
-    return parked_scooters
+    return []
 
 
 def locate_our_scooters():

days/037-40-pyramid-intro/demo/billtracker/billtracker/data/db_session.py

@@ -25,8 +25,8 @@ def global_init(db_file: str):
 
         DbSession.db_folder = os.path.dirname(db_file)
 
-        conn_str = 'sqlite:///' + db_file
-        print("Connecting to DB at: {}".format(conn_str))
+        conn_str = f'sqlite:///{db_file}'
+        print(f"Connecting to DB at: {conn_str}")
 
         engine = sqlalchemy.create_engine(conn_str, echo=False)
         DbSession.engine = engine

days/037-40-pyramid-intro/demo/billtracker/billtracker/views/default.py

@@ -60,4 +60,4 @@ def details_post(request: Request):
 
     repository.add_payment(amount, bill_id)
 
-    return HTTPFound(___location='/bill/{}'.format(bill_id))
+    return HTTPFound(___location=f'/bill/{bill_id}')

days/050-responder/demo/movie_svc/data/db.py

@@ -3,7 +3,7 @@
 import collections
 from typing import List
 
-__movie_data = dict()
+__movie_data = {}
 
 Movie = collections.namedtuple(
     'Movie',
@@ -15,7 +15,7 @@ def movie_to_dict(m: Movie):
     if not m:
         return {}
 
-    d = dict(
+    return dict(
         imdb_code=m.imdb_code,
         title=m.title,
         director=m.director,
@@ -24,16 +24,13 @@ def movie_to_dict(m: Movie):
         genres=list(m.genres),
         rating=m.rating,
         year=m.year,
-        imdb_score=m.imdb_score
+        imdb_score=m.imdb_score,
     )
 
-    return d
-
 
 def find_by_imdb(imdb_code: str) -> Movie:
     global __movie_data
-    movie = __movie_data.get(imdb_code)
-    return movie
+    return __movie_data.get(imdb_code)
 
 
 def search_keyword(keyword: str) -> List[Movie]:
@@ -62,12 +59,7 @@ def search_title(keyword: str) -> List[Movie]:
 
     keyword = keyword.lower().strip()
 
-    hits = []
-    for m in __movie_data.values():
-        if m.lower_title.find(keyword) >= 0:
-            hits.append(m)
-
-    return hits
+    return [m for m in __movie_data.values() if m.lower_title.find(keyword) >= 0]
 
 
 def search_director(director: str) -> List[Movie]:
@@ -78,12 +70,11 @@ def search_director(director: str) -> List[Movie]:
 
     director = director.lower().strip()
 
-    hits = []
-    for m in __movie_data.values():
-        if m.director.lower().find(director) >= 0:
-            hits.append(m)
-
-    return hits
+    return [
+        m
+        for m in __movie_data.values()
+        if m.director.lower().find(director) >= 0
+    ]
 
 
 def global_init():
@@ -113,10 +104,7 @@ def global_init():
 
 
 def __make_numerical(text):
-    if not text or not text.strip():
-        return 0
-
-    return int(text)
+    return 0 if not text or not text.strip() else int(text)
 
 
 def __build_imdb_code(link):
@@ -126,21 +114,12 @@ def __build_imdb_code(link):
     # tt0449088
 
     parts = link.split('/')
-    if len(parts) < 5:
-        return None
-
-    return parts[4]
+    return None if len(parts) < 5 else parts[4]
 
 
 def __split_separated_text(text):
     if not text:
         return text
 
     text = text.strip()
-    parts = [
-        p.strip()
-        for p in text.split('|')
-        if p and p.strip()
-    ]
-
-    return parts
+    return [p.strip() for p in text.split('|') if p and p.strip()]