server/general: rename 'util' to 'func'

server/szurubooru/api/password_reset_api.py

@@ -1,6 +1,6 @@
 from szurubooru import config, errors
-from szurubooru.util import auth, mailer, users
 from szurubooru.api.base_api import BaseApi
+from szurubooru.func import auth, mailer, users
 
 MAIL_SUBJECT = 'Password reset for {name}'
 MAIL_BODY = \

server/szurubooru/api/tag_api.py

@@ -1,7 +1,7 @@
 import datetime
 from szurubooru import search
-from szurubooru.util import auth, tags, snapshots
 from szurubooru.api.base_api import BaseApi
+from szurubooru.func import auth, tags, snapshots
 
 def _serialize_tag(tag):
     return {

server/szurubooru/api/tag_category_api.py

@@ -1,5 +1,5 @@
-from szurubooru.util import auth, tags, tag_categories, snapshots
 from szurubooru.api.base_api import BaseApi
+from szurubooru.func import auth, tags, tag_categories, snapshots
 
 def _serialize_category(category):
     return {

server/szurubooru/api/user_api.py

@@ -1,7 +1,7 @@
 import hashlib
 from szurubooru import config, search
-from szurubooru.util import auth, users
 from szurubooru.api.base_api import BaseApi
+from szurubooru.func import auth, users
 
 def _serialize_user(authenticated_user, user):
     ret = {

server/szurubooru/func/tag_categories.py

@@ -1,6 +1,6 @@
 import re
 from szurubooru import config, db, errors
-from szurubooru.util import misc
+from szurubooru.func import misc
 
 class TagCategoryNotFoundError(errors.NotFoundError): pass
 class TagCategoryAlreadyExistsError(errors.ValidationError): pass

server/szurubooru/func/tags.py

@@ -4,7 +4,7 @@ import os
 import re
 import sqlalchemy
 from szurubooru import config, db, errors
-from szurubooru.util import misc, tag_categories
+from szurubooru.func import misc, tag_categories
 
 class TagNotFoundError(errors.NotFoundError): pass
 class TagAlreadyExistsError(errors.ValidationError): pass

server/szurubooru/func/users.py

@@ -2,7 +2,7 @@ import datetime
 import re
 from sqlalchemy import func
 from szurubooru import config, db, errors
-from szurubooru.util import auth, misc, files, images
+from szurubooru.func import auth, misc, files, images
 
 class UserNotFoundError(errors.NotFoundError): pass
 class UserAlreadyExistsError(errors.ValidationError): pass

server/szurubooru/middleware/authenticator.py

@@ -1,7 +1,7 @@
 import base64
 import falcon
 from szurubooru import db, errors
-from szurubooru.util import auth, users
+from szurubooru.func import auth, users
 
 class Authenticator(object):
     '''

server/szurubooru/search/base_search_config.py

@@ -1,6 +1,6 @@
 import sqlalchemy
 import szurubooru.errors
-from szurubooru.util import misc
+from szurubooru.func import misc
 from szurubooru.search import criteria
 
 class BaseSearchConfig(object):

server/szurubooru/tests/api/test_password_reset.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from unittest import mock
 import pytest
 from szurubooru import api, db, errors
-from szurubooru.util import auth, mailer
+from szurubooru.func import auth, mailer
 
 @pytest.fixture
 def password_reset_api(config_injector):

server/szurubooru/tests/api/test_tag_category_creating.py

@@ -1,7 +1,7 @@
 import os
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tag_categories
+from szurubooru.func import misc, tag_categories
 
 @pytest.fixture
 def test_ctx(tmpdir, config_injector, context_factory, user_factory):

server/szurubooru/tests/api/test_tag_category_deleting.py

@@ -2,7 +2,7 @@ import pytest
 import os
 from datetime import datetime
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tags, tag_categories
+from szurubooru.func import misc, tags, tag_categories
 
 @pytest.fixture
 def test_ctx(

server/szurubooru/tests/api/test_tag_category_retrieving.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import api, db, errors
-from szurubooru.util import misc, tag_categories
+from szurubooru.func import misc, tag_categories
 
 @pytest.fixture
 def test_ctx(

server/szurubooru/tests/api/test_tag_category_updating.py

@@ -1,7 +1,7 @@
 import os
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tag_categories
+from szurubooru.func import misc, tag_categories
 
 @pytest.fixture
 def test_ctx(

server/szurubooru/tests/api/test_tag_creating.py

@@ -2,7 +2,7 @@ import datetime
 import os
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tags
+from szurubooru.func import misc, tags
 
 def get_tag(name):
     return db.session \

server/szurubooru/tests/api/test_tag_deleting.py

@@ -2,7 +2,7 @@ import pytest
 import os
 from datetime import datetime
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tags
+from szurubooru.func import misc, tags
 
 @pytest.fixture
 def test_ctx(

server/szurubooru/tests/api/test_tag_export.py

@@ -2,7 +2,7 @@ import datetime
 import os
 import json
 from szurubooru import config, db
-from szurubooru.util import tags
+from szurubooru.func import tags
 
 def test_export(
         tmpdir,

server/szurubooru/tests/api/test_tag_retrieving.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import api, db, errors
-from szurubooru.util import misc, tags
+from szurubooru.func import misc, tags
 
 @pytest.fixture
 def test_ctx(context_factory, config_injector, user_factory, tag_factory):

server/szurubooru/tests/api/test_tag_updating.py

@@ -2,7 +2,7 @@ import datetime
 import os
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import misc, tags
+from szurubooru.func import misc, tags
 
 def get_tag(name):
     return db.session \

server/szurubooru/tests/api/test_user_creating.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import auth, misc, users
+from szurubooru.func import auth, misc, users
 
 EMPTY_PIXEL = \
     b'\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x01\x00\x00\x00\x00' \

server/szurubooru/tests/api/test_user_deleting.py

@@ -1,7 +1,7 @@
 import pytest
 from datetime import datetime
 from szurubooru import api, db, errors
-from szurubooru.util import misc, users
+from szurubooru.func import misc, users
 
 @pytest.fixture
 def test_ctx(config_injector, context_factory, user_factory):

server/szurubooru/tests/api/test_user_retrieving.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import api, db, errors
-from szurubooru.util import misc, users
+from szurubooru.func import misc, users
 
 @pytest.fixture
 def test_ctx(context_factory, config_injector, user_factory):

server/szurubooru/tests/api/test_user_updating.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import api, config, db, errors
-from szurubooru.util import auth, misc, users
+from szurubooru.func import auth, misc, users
 
 EMPTY_PIXEL = \
     b'\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x01\x00\x00\x00\x00' \

server/szurubooru/tests/conftest.py

@@ -5,7 +5,7 @@ import pytest
 import freezegun
 import sqlalchemy
 from szurubooru import api, config, db
-from szurubooru.util import misc
+from szurubooru.func import misc
 
 class QueryCounter(object):
     def __init__(self):

server/szurubooru/tests/func/test_misc.py

@@ -1,6 +1,6 @@
 import pytest
 from szurubooru import errors
-from szurubooru.util import misc
+from szurubooru.func import misc
 from datetime import datetime
 
 dt = datetime

server/szurubooru/tests/func/test_snapshots.py

@@ -1,7 +1,7 @@
 import datetime
 import pytest
 from szurubooru import db
-from szurubooru.util import snapshots
+from szurubooru.func import snapshots
 
 def test_serializing_tag(tag_factory):
     tag = tag_factory(names=['main_name', 'alias'], category_name='dummy')