Skip to content

Commit

Permalink
Convert few hidden relative imports
Browse files Browse the repository at this point in the history
  • Loading branch information
smotornyuk committed Jan 21, 2020
1 parent 0e642f7 commit 739cb81
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
9 changes: 5 additions & 4 deletions ckan/lib/extract.py
Expand Up @@ -2,7 +2,7 @@

import re
from jinja2.ext import babel_extract as extract_jinja2
import lib.jinja_extensions
import ckan.lib.jinja_extensions
from six import string_types

jinja_extensions = '''
Expand All @@ -16,6 +16,7 @@
ckan.lib.jinja_extensions.UrlForExtension
'''


def jinja2_cleaner(fileobj, *args, **kw):
# We want to format the messages correctly and intercepting here seems
# the best location
Expand All @@ -27,10 +28,10 @@ def jinja2_cleaner(fileobj, *args, **kw):
for lineno, func, message, finder in raw_extract:

if isinstance(message, string_types):
message = lib.jinja_extensions.regularise_html(message)
message = ckan.lib.jinja_extensions.regularise_html(message)
elif message is not None:
message = (lib.jinja_extensions.regularise_html(message[0])
,lib.jinja_extensions.regularise_html(message[1]))
message = (ckan.lib.jinja_extensions.regularise_html(message[0]),
ckan.lib.jinja_extensions.regularise_html(message[1]))

yield lineno, func, message, finder

Expand Down
7 changes: 3 additions & 4 deletions ckan/lib/plugins.py
Expand Up @@ -8,7 +8,6 @@

from ckan.common import c, g
from ckan import logic
import logic.schema
from ckan import plugins
import ckan.authz
import ckan.plugins.toolkit as toolkit
Expand Down Expand Up @@ -326,13 +325,13 @@ class DefaultDatasetForm(object):
'''
def create_package_schema(self):
return ckan.logic.schema.default_create_package_schema()
return logic.schema.default_create_package_schema()

def update_package_schema(self):
return ckan.logic.schema.default_update_package_schema()
return logic.schema.default_update_package_schema()

def show_package_schema(self):
return ckan.logic.schema.default_show_package_schema()
return logic.schema.default_show_package_schema()

def setup_template_variables(self, context, data_dict):
data_dict.update({'available_only': True})
Expand Down

0 comments on commit 739cb81

Please sign in to comment.