entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 41 Releases Activity

misc: convert more import to be relative (#36566)

This commit is contained in:
Frédéric Péters 2019-09-30 21:57:05 +02:00
parent d50ce84406
commit 59e506e86a
13 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/admin/bounces.py
View File

@ -32,7 +32,7 @@ from ..qommon.form import *
from ..qommon.misc import get_cfg
def get_email_type_label(type):
from settings import EmailsDirectory
from .settings import EmailsDirectory
return EmailsDirectory.emails_dict.get(type, {}).get('description')
class BouncePage(Directory):

3
wcs/admin/settings.py
View File

@ -1200,7 +1200,6 @@ class SettingsDirectory(QommonSettingsDirectory):
all_elems.append(form)
all_elems.append(formdef)
from workflows import Workflow
for workflow in Workflow.select():
workflow.name = toutf8(workflow.name)
if workflow.possible_status:
@ -1214,7 +1213,7 @@ class SettingsDirectory(QommonSettingsDirectory):
setattr(item, attr, toutf8(getattr(item, attr)))
all_elems.append(workflow)
from categories import Category
from ..categories import Category
for category in Category.select():
category.name = toutf8(category.name)
category.description = toutf8(category.description)

2
wcs/carddata.py
View File

@ -21,7 +21,7 @@ class CardData(FormData):
def get_formdef(self):
if self._formdef:
return self._formdef
from carddef import CardDef
from .carddef import CardDef
type, id = self._names.split('-', 1)
try:
self._formdef = CardDef.get_by_urlname(id)

6
wcs/carddef.py
View File

@ -43,7 +43,7 @@ class CardDef(FormDef):
if data_class._formdef is self:
return data_class
if (get_publisher().is_using_postgresql() and not mode == 'files') or mode == 'sql':
import sql
from . import sql
table_name = sql.get_formdef_table_name(self)
cls = new.classobj(self.url_name.title(), (sql.SqlCardData,),
{'_formdef': self,
@ -65,14 +65,14 @@ class CardDef(FormDef):
@classmethod
def get_sql_new_id(cls, id_start):
import sql
from . import sql
return sql.get_carddef_new_id(id_start=id_start)
@classmethod
def wipe(cls):
super(CardDef, cls).wipe()
if get_publisher().is_using_postgresql():
import sql
from . import sql
sql.carddef_wipe()
@classmethod

2
wcs/categories.py
View File

@ -83,7 +83,7 @@ class Category(XmlStorableObject):
categories.sort(cmp_position)
def remove_self(self):
from formdef import FormDef
from .formdef import FormDef
for form in FormDef.select(lambda x: x.category_id == self.id):
form.category_id = None
form.store()

2
wcs/fields.py
View File

@ -1656,7 +1656,7 @@ class PageCondition(Condition):
# create variables with values currently being evaluated, not yet
# available in the formdata.
from formdata import get_dict_with_varnames
from .formdata import get_dict_with_varnames
live_data = {}
form_live_data = {}
if dict_vars is not None:

2
wcs/formdata.py
View File

@ -269,7 +269,7 @@ class FormData(StorableObject):
def get_formdef(self):
if self._formdef:
return self._formdef
from formdef import FormDef
from .formdef import FormDef
type, id = self._names.split('-', 1)
try:
self._formdef = FormDef.get_by_urlname(id)

14
wcs/formdef.py
View File

@ -192,7 +192,7 @@ class FormDef(StorableObject):
changed = True
if not self.table_name and get_publisher().has_site_option('postgresql'):
import sql
from . import sql
self.table_name = sql.get_formdef_table_name(self)
changed = True
@ -243,7 +243,7 @@ class FormDef(StorableObject):
if get_publisher().is_using_postgresql():
# recreate global views so they don't reference formdata from
# deleted formefs
import sql
from . import sql
conn, cur = sql.get_connection_and_cursor()
sql.do_global_views(conn, cur)
conn.commit()
@ -259,7 +259,7 @@ class FormDef(StorableObject):
if data_class._formdef is self:
return data_class
if (get_publisher().is_using_postgresql() and not mode == 'files') or mode == 'sql':
import sql
from . import sql
table_name = sql.get_formdef_table_name(self)
cls = new.classobj(self.url_name.title(), (sql.SqlFormData,),
{'_formdef': self,
@ -340,14 +340,14 @@ class FormDef(StorableObject):
@classmethod
def get_sql_new_id(cls, id_start):
import sql
from . import sql
return sql.get_formdef_new_id(id_start=id_start)
@classmethod
def wipe(cls):
super(FormDef, cls).wipe()
if get_publisher().is_using_postgresql():
import sql
from . import sql
sql.formdef_wipe()
def store(self):
@ -370,7 +370,7 @@ class FormDef(StorableObject):
self.last_modification_user_id = None
t = StorableObject.store(self)
if get_publisher().is_using_postgresql():
import sql
from . import sql
sql.do_formdef_tables(self, rebuild_views=True,
rebuild_global_views=True)
return t
@ -380,7 +380,7 @@ class FormDef(StorableObject):
def rebuild(self):
if get_publisher().is_using_postgresql():
import sql
from . import sql
sql.do_formdef_tables(self, rebuild_views=True,
rebuild_global_views=True)

26
wcs/publisher.py
View File

@ -22,10 +22,10 @@ import zipfile
from django.utils.six.moves import cPickle
from Defaults import *
from .Defaults import *
try:
from wcs_cfg import *
from .wcs_cfg import *
except ImportError:
pass
@ -150,7 +150,7 @@ class WcsPublisher(StubWcsPublisher):
wcs.workflows.load_extra()
if self.is_using_postgresql() and not skip_sql:
import sql
from . import sql
self.user_class = sql.SqlUser
self.tracking_code_class = sql.TrackingCode
self.session_class = sql.Session
@ -260,16 +260,16 @@ class WcsPublisher(StubWcsPublisher):
continue
klass = None
if k == 'formdefs':
from formdef import FormDef
from .formdef import FormDef
klass = FormDef
elif k == 'carddefs':
from carddef import CardDef
from .carddef import CardDef
klass = CardDef
elif k == 'categories':
from categories import Category
from .categories import Category
klass = Category
elif k == 'roles':
from roles import Role
from .roles import Role
klass = Role
elif k == 'workflows':
from wcs.workflows import Workflow
@ -300,14 +300,14 @@ class WcsPublisher(StubWcsPublisher):
exclude_user=exclude_user)
def initialize_sql(self):
import sql
from . import sql
sql.get_connection(new=True)
sql.do_session_table()
sql.do_user_table()
sql.do_tracking_code_table()
sql.do_meta_table()
from formdef import FormDef
from carddef import CardDef
from .formdef import FormDef
from .carddef import CardDef
conn, cur = sql.get_connection_and_cursor()
sql.drop_views(None, conn, cur)
for formdef in FormDef.select() + CardDef.select():
@ -328,11 +328,11 @@ class WcsPublisher(StubWcsPublisher):
WorkflowGlobalActionTimeoutTrigger.apply(workflow)
def migrate_sql(self):
import sql
from . import sql
sql.migrate()
def reindex_sql(self):
import sql
from . import sql
sql.reindex()
def cleanup(self):
@ -340,7 +340,7 @@ class WcsPublisher(StubWcsPublisher):
self.statsd.udp_sock.close()
self.statsd = None
if self.is_using_postgresql():
import sql
from . import sql
sql.cleanup_connection()
set_publisher_class(WcsPublisher)

2
wcs/qommon/publisher.py
View File

@ -949,7 +949,7 @@ class QommonPublisher(Publisher, object):
return ['lazy', 'django-condition']
def get_substitution_variables(self):
import misc
from . import misc
from wcs.variables import LazyDateObject
d = {
'site_name': get_cfg('misc', {}).get('sitename', None),

10
wcs/qommon/template.py
View File

@ -126,7 +126,7 @@ def get_themes():
return themes
def get_current_theme():
from publisher import get_cfg
from .publisher import get_cfg
current_theme = get_cfg('branding', {}).get('theme', 'default')
system_location = os.path.join(get_publisher().data_dir, 'themes', current_theme)
local_location = os.path.join(get_publisher().app_dir, 'themes', current_theme)
@ -218,7 +218,7 @@ def error_page(error_message, error_title = None, exception = None, continue_to
return htmltext(r.getvalue())
def get_default_ezt_template():
from publisher import get_cfg
from .publisher import get_cfg
current_theme = get_cfg('branding', {}).get('theme', 'default')
filename = os.path.join(get_publisher().app_dir, 'themes',
@ -243,7 +243,7 @@ def get_default_ezt_template():
def get_decorate_vars(body, response, generate_breadcrumb=True, **kwargs):
from publisher import get_cfg
from .publisher import get_cfg
body = str(body)
@ -360,7 +360,7 @@ def decorate(body, response):
if get_request().get_header('x-popup') == 'true':
return '''<div class="popup-content"> %s </div>''' % body
from publisher import get_cfg
from .publisher import get_cfg
generate_breadcrumb = True
if True:
template_ezt = get_cfg('branding', {}).get('template')
@ -425,7 +425,7 @@ class TemplateError(Exception):
self.params = params
def __str__(self):
import misc
from . import misc
return misc.site_encode(smart_text(self.msg) % self.params)

8
wcs/users.py
View File

@ -72,7 +72,7 @@ class User(StorableObject):
@classmethod
def get_formdef(cls):
from admin.settings import UserFieldsFormDef
from .admin.settings import UserFieldsFormDef
return UserFieldsFormDef()
@property
@ -115,7 +115,7 @@ class User(StorableObject):
return True
if self.anonymous:
return False
from roles import Role
from .roles import Role
for role_id in self.roles or []:
try:
role = Role.get(role_id)
@ -142,7 +142,7 @@ class User(StorableObject):
@classmethod
def get_available_roles(cls):
from roles import get_user_roles
from .roles import get_user_roles
return get_user_roles()
def add_roles(self, roles):
@ -172,7 +172,7 @@ class User(StorableObject):
}
formdef = self.get_formdef()
if formdef:
from formdata import get_dict_with_varnames
from .formdata import get_dict_with_varnames
data = get_dict_with_varnames(formdef.fields, self.form_data)
for k, v in data.items():
d[prefix+'user_'+k] = v

2
wcs/wf/jump.py
View File

@ -277,7 +277,7 @@ def workflows_with_timeout():
def _apply_timeouts(publisher):
'''Traverse all filled form and apply expired timeout jumps if needed'''
from formdef import FormDef
from ..formdef import FormDef
wfs_status = workflows_with_timeout()
for formdef in FormDef.select(ignore_errors=True):