Skip to content
This repository has been archived by the owner on Sep 5, 2019. It is now read-only.

Commit

Permalink
Switches to onegov core's custom json module
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis Krienbühl committed Dec 22, 2017
1 parent c8d99a9 commit 51025fc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions HISTORY.rst
@@ -1,6 +1,9 @@
Changelog
---------

- Switches to onegov core's custom json module.
[href]

- Adds support for text to url migration.
[href]

Expand Down
2 changes: 1 addition & 1 deletion onegov/directory/archive.py
@@ -1,5 +1,4 @@
import mimetypes
import json
import shutil
import os

Expand All @@ -8,6 +7,7 @@
from onegov.core.csv import convert_list_of_dicts_to_xlsx
from onegov.core.csv import convert_xls_to_csv
from onegov.core.csv import CSVFile
from onegov.core.custom import json
from onegov.core.utils import Bunch, rchop, is_subpath
from onegov.directory.errors import MissingColumnError
from onegov.directory.models import Directory, DirectoryEntry
Expand Down
2 changes: 1 addition & 1 deletion onegov/directory/tests/test_archive.py
@@ -1,8 +1,8 @@
import json
import pytest
import transaction

from datetime import date
from onegov.core.custom import json
from onegov.core.utils import Bunch
from onegov.directory import DirectoryCollection
from onegov.directory import DirectoryConfiguration
Expand Down
2 changes: 1 addition & 1 deletion onegov/directory/types/directory_configuration.py
Expand Up @@ -3,7 +3,7 @@
from collections import defaultdict
from datetime import date, datetime, time
from more_itertools import collapse
from onegov.core import custom_json as json
from onegov.core.custom import json
from onegov.core.utils import normalize_for_url, safe_format, safe_format_keys
from onegov.form import parse_formcode, flatten_fieldsets, as_internal_id
from sqlalchemy.ext.mutable import Mutable
Expand Down

0 comments on commit 51025fc

Please sign in to comment.