Whitespace nitpicks

Author: encukou

naucse/models.py

@@ -201,7 +201,7 @@ def convert_url(url):
     @staticmethod
     def limit_css_to_lesson_content(css):
         """ Returns ``css`` limited just to the ``.lesson-content`` element.
-   
+
         This doesn't protect against malicious input.
         """
         parser = cssutils.CSSParser(raiseExceptions=True)
@@ -476,7 +476,7 @@ def slug(self):
         directory = self.path.parts[-1]
         parent_directory = self.path.parts[-2]
         if parent_directory == "courses":
-            parent_directory = "course" # legacy URL
+            parent_directory = "course"  # legacy URL
         return parent_directory + "/" + directory
 
     def is_link(self):

naucse/templates.py

@@ -189,6 +189,7 @@ def format_date_range(start_and_end):
     parts += [format_date(end)]
     return ''.join(parts).format(start=start, end=end)
 
+
 @template_filter()
 def monthname(number):
     return ('Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec',

naucse/utils/forks.py

@@ -125,9 +125,13 @@ def render(page_type: str, slug: str, *args, **kwargs) -> Dict[str, Any]:
                 # if content isn't cached or the version was refused, let's render
                 # the content here (but just the content and not the whole page with headers, menus etc)
                 if content is not_processed:
-                    content = views.page_content(lesson, page, solution, course,
-                                                  lesson_url=lesson_url, subpage_url=subpage_url, static_url=static_url,
-                                                  without_cache=True)
+                    content = views.page_content(
+                        lesson, page, solution, course,
+                        lesson_url=lesson_url,
+                        subpage_url=subpage_url,
+                        static_url=static_url,
+                        without_cache=True,
+                    )
 
                 if content is None:
                     info["content"] = None

naucse/utils/models.py

@@ -157,7 +157,7 @@ def __get__(self, instance, cls):
 
 class DirProperty(LazyProperty):
     """Ordered dict of models from a subdirectory
-    
+
     If ``info.yml`` is present in the subdirectory, use it for the order
     of the models.  The rest is appended alphabetically.
     """

naucse/views.py

@@ -44,6 +44,7 @@
 
 _cached_model = None
 
+
 @LocalProxy
 def model():
     """Return the root of the naucse model
@@ -62,6 +63,7 @@ def model():
         _cached_model = model
     return model
 
+
 register_url_converters(app, model)
 
 app.jinja_env.undefined = StrictUndefined
@@ -659,14 +661,14 @@ def lesson(lesson, page, solution=None):
         **kwargs
     )
 
+
 def session_coverpage_content(course, session, coverpage):
     def lesson_url(lesson, *args, **kwargs):
         if kwargs.get("page") == "index":
             kwargs.pop("page")
 
         return url_for('course_page', course=course, lesson=lesson, *args, **kwargs)
 
-
     content = session.get_coverpage_content(course, coverpage, app)
 
     homework_section = False
@@ -693,7 +695,6 @@ def lesson_url(lesson, *args, **kwargs):
     )
 
 
-
 @app.route('/<course:course>/sessions/<session>/', defaults={'coverpage': 'front'})
 @app.route('/<course:course>/sessions/<session>/<coverpage>/')
 def session_coverpage(course, session, coverpage):
@@ -764,7 +765,6 @@ def course_calendar_content(course):
     )
 
 
-
 @app.route('/<course:course>/calendar/')
 def course_calendar(course):
     if course.is_link():
@@ -825,9 +825,9 @@ def generate_calendar_ics(course):
             begin=start_time,
             end=end_time,
             uid=url_for("session_coverpage",
-                      course=course,
-                      session=session.slug,
-                      _external=True),
+                        course=course,
+                        session=session.slug,
+                        _external=True),
         )
         calendar.events.append(cal_event)
 

test_naucse/test_filters.py

@@ -20,6 +20,7 @@
 def test_format_date_range(start, end, result):
     assert naucse.templates.format_date_range((start, end)) == result
 
+
 @pytest.mark.parametrize(
     ('time', 'result'),
     (
@@ -33,4 +34,3 @@ def test_format_date_range(start, end, result):
 )
 def test_format_time(time, result):
     assert naucse.templates.format_time(time) == result
-

test_naucse/test_markdown.py

@@ -263,6 +263,7 @@ def test_convert_with_dosvenv_prompt(pre_prompt, space, command):
     """).strip().replace('\n', '').format(pre_prompt, space, html.escape(command))
     assert convert_markdown(src).replace('\n', '') == expected
 
+
 def test_convert_full_dosvenv_prompt():
     src = dedent(r"""
         ```dosvenv

test_naucse/test_merge_dict.py

@@ -2,37 +2,43 @@
 
 from naucse.models import merge_dict
 
+
 def test_scalars():
     assert merge_dict(
          {'a': 1, 'b': 2},
          {'b': 5, 'c': 6},
     ) == {'a': 1, 'b': 5, 'c': 6}
 
+
 def test_subdict():
     assert merge_dict(
          {'subdict': {'a': 1, 'b': 2}},
          {'subdict': {'b': 5, 'c': 6}},
     ) == {'subdict': {'a': 1, 'b': 5, 'c': 6}}
 
+
 def test_sublist_merge():
     assert merge_dict(
          {'sublist': [1, 2, 3]},
          {'sublist': [4, 5, 6]},
     ) == {'sublist': [4, 5, 6]}
 
+
 def test_sublist_with_merge():
     assert merge_dict(
          {'sublist': [1, 2, 3]},
          {'sublist': [0, '+merge', 4]},
     ) == {'sublist': [0, 1, 2, 3, 4]}
 
+
 def test_not_incompatible_types_dict():
     with pytest.raises(TypeError):
         assert merge_dict(
             {'item': 123},
             {'item': {'b': 5, 'c': 6}},
         )
 
+
 def test_not_incompatible_types_list():
     with pytest.raises(TypeError):
         assert merge_dict(

test_naucse/test_session_times.py

@@ -9,6 +9,7 @@
 
 TZINFO = dateutil.tz.gettz('Europe/Prague')
 
+
 @pytest.fixture
 def model():
     path = Path(__file__).parent / 'fixtures/test_content'