Moved utils to a new folder

Fixes: #348

Author: mikicz

naucse/models.py

@@ -1,15 +1,14 @@
 from collections import OrderedDict
-import copy
 import datetime
 
 import dateutil.tz
 import jinja2
 
-from naucse.modelutils import Model, YamlProperty, DataProperty, DirProperty
-from naucse.modelutils import reify
+from naucse.utils.models import Model, YamlProperty, DataProperty, DirProperty
+from naucse.utils.models import reify
 from naucse.templates import setup_jinja_env, vars_functions
-from naucse.markdown_util import convert_markdown
-from naucse.notebook_util import convert_notebook
+from naucse.utils.markdown import convert_markdown
+from naucse.utils.notebook import convert_notebook
 from pathlib import Path
 
 _TIMEZONE = 'Europe/Prague'

naucse/routes.py

@@ -3,7 +3,7 @@
 import calendar
 
 from flask import Flask, render_template, url_for, send_from_directory
-from flask import abort, redirect, Response
+from flask import abort, Response
 from jinja2 import StrictUndefined
 from jinja2.exceptions import TemplateNotFound
 from werkzeug.local import LocalProxy

naucse/templates.py

@@ -3,7 +3,7 @@
 
 from jinja2 import Markup, contextfilter
 
-from naucse import markdown_util
+import naucse.utils.markdown
 
 
 template_filters = {}
@@ -36,7 +36,7 @@ def setup_jinja_env(jinja_env):
 
 @template_filter()
 def markdown(text, inline=False):
-    return markdown_util.convert_markdown(text, inline=inline)
+    return naucse.utils.markdown.convert_markdown(text, inline=inline)
 
 
 @template_filter()
@@ -83,7 +83,7 @@ def solution(ctx, text):
                                      page=ctx['page'].slug,
                                      solution=solution_index)
 
-    solution = markdown_util.convert_markdown(text)
+    solution = naucse.utils.markdown.convert_markdown(text)
     solutions.append(solution)
 
     t = Markup(textwrap.dedent("""

naucse/urlconverters.py

@@ -36,7 +36,7 @@ def to_python(self, value):
 
     def to_url(self, value):
         if isinstance(value, str):
-            if "/" not in value: # XXX
+            if "/" not in value:  # XXX
                 value = "course/"+value
             value = self.to_python(value)
         return value.slug

naucse/utils/__init__.py

@@ -3,7 +3,7 @@
 import nbformat
 import traitlets
 
-from . markdown_util import convert_markdown
+from naucse.utils.markdown import convert_markdown
 
 
 class NaucseHTMLExporter(HTMLExporter):

naucse/markdown_util.py naucse/utils/markdown.pynaucse/markdown_util.py renamed to naucse/utils/markdown.py

@@ -3,8 +3,7 @@
 
 import pytest
 
-from naucse.markdown_util import convert_markdown
-from naucse.markdown_util import style_space_after_prompt
+from naucse.utils.markdown import convert_markdown, style_space_after_prompt
 
 
 def test_markdown_admonition():

naucse/modelutils.py naucse/utils/models.pynaucse/modelutils.py renamed to naucse/utils/models.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from naucse.notebook_util import convert_notebook
+from naucse.utils.notebook import convert_notebook
 
 
 FIXTURES = 'test_naucse/fixtures'