misc: pylint fix import-error (#52222)
This commit is contained in:
parent
101f8d06b2
commit
1910130955
|
@ -18,13 +18,14 @@
|
|||
|
||||
import time
|
||||
|
||||
from qommon import _
|
||||
from qommon import misc
|
||||
from quixote import get_publisher
|
||||
from quixote import get_request
|
||||
from quixote.html import TemplateIO
|
||||
from quixote.html import htmltext
|
||||
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.misc import localstrftime
|
||||
|
||||
|
||||
def last_modification_block(obj):
|
||||
r = TemplateIO(html=True)
|
||||
|
@ -38,7 +39,7 @@ def last_modification_block(obj):
|
|||
r += htmltext('<p class="last-modification %s">') % warning_class
|
||||
r += _('Last Modification:')
|
||||
r += ' '
|
||||
r += misc.localstrftime(timestamp)
|
||||
r += localstrftime(timestamp)
|
||||
r += ' '
|
||||
if user_id:
|
||||
try:
|
||||
|
@ -59,9 +60,9 @@ def snapshot_info_block(snapshot):
|
|||
elif snapshot.comment:
|
||||
parts.append(snapshot.comment)
|
||||
if snapshot.user_id:
|
||||
parts.append('%s (%s)' % (misc.localstrftime(snapshot.timestamp), snapshot.user))
|
||||
parts.append('%s (%s)' % (localstrftime(snapshot.timestamp), snapshot.user))
|
||||
else:
|
||||
parts.append(misc.localstrftime(snapshot.timestamp))
|
||||
parts.append(localstrftime(snapshot.timestamp))
|
||||
r += htmltext('<br />').join(parts)
|
||||
r += htmltext('</p>')
|
||||
if snapshot.previous or snapshot.next:
|
||||
|
|
|
@ -33,6 +33,7 @@ from quixote.directory import Directory
|
|||
from quixote.errors import MethodNotAllowedError
|
||||
|
||||
import wcs.qommon.storage as st
|
||||
from wcs.admin.settings import UserFieldsFormDef
|
||||
from wcs.api_utils import get_query_flag
|
||||
from wcs.api_utils import get_user_from_api_query_string
|
||||
from wcs.api_utils import is_url_signed
|
||||
|
@ -964,8 +965,6 @@ class ApiUsersDirectory(Directory):
|
|||
criterias = []
|
||||
query = get_request().form.get('q')
|
||||
if query:
|
||||
from admin.settings import UserFieldsFormDef
|
||||
|
||||
formdef = UserFieldsFormDef()
|
||||
criteria_fields = [
|
||||
st.ILike('name', query),
|
||||
|
|
|
@ -24,7 +24,6 @@ import os
|
|||
import random
|
||||
import urllib.parse
|
||||
|
||||
import qommon.misc
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.encoding import force_text
|
||||
from quixote import get_publisher
|
||||
|
@ -34,6 +33,7 @@ from .api_access import ApiAccess
|
|||
from .qommon.errors import AccessForbiddenError
|
||||
from .qommon.errors import HttpResponse401Error
|
||||
from .qommon.errors import UnknownNameIdAccessForbiddenError
|
||||
from .qommon.misc import simplify
|
||||
|
||||
DEFAULT_DURATION = 30
|
||||
|
||||
|
@ -88,7 +88,7 @@ def is_url_signed(utcnow=None, duration=DEFAULT_DURATION):
|
|||
until = calendar.timegm(until.timetuple())
|
||||
# normalize nonce
|
||||
nonce = nonce[:128]
|
||||
nonce = qommon.misc.simplify(nonce).replace('/', '-')
|
||||
nonce = simplify(nonce).replace('/', '-')
|
||||
nonce_dir = os.path.join(get_publisher().app_dir, 'nonces')
|
||||
nonce_path = os.path.join(nonce_dir, nonce)
|
||||
try:
|
||||
|
|
|
@ -98,13 +98,13 @@ class WcsPublisher(StubWcsPublisher):
|
|||
|
||||
@classmethod
|
||||
def get_backoffice_module(cls):
|
||||
import backoffice
|
||||
from wcs import backoffice
|
||||
|
||||
return backoffice
|
||||
|
||||
@classmethod
|
||||
def get_admin_module(cls):
|
||||
import admin
|
||||
from wcs import admin
|
||||
|
||||
return admin
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@ from . import template
|
|||
from .form import Form
|
||||
from .form import HtmlWidget
|
||||
from .form import PasswordWidget
|
||||
from .ident.password import check_password
|
||||
from .ident.password_accounts import PasswordAccount
|
||||
|
||||
|
||||
|
@ -159,8 +160,6 @@ class MyspaceDirectory(Directory):
|
|||
return redirect('.')
|
||||
|
||||
if form.is_submitted() and not form.has_errors():
|
||||
from .qommon.ident.password import check_password
|
||||
|
||||
check_password(form, 'new_password')
|
||||
new_password = form.get_widget('new_password').parse()
|
||||
new2_password = form.get_widget('new2_password').parse()
|
||||
|
|
Loading…
Reference in New Issue