From 2d1d286be25cb9d0f27dd46c4e97a5bbbde64f78 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 22 Mar 2016 22:46:04 +0100 Subject: [PATCH] core (tools): moved common to a separate package, and put data method in a data_format module --- frontends/src/jp/cmd_blog.py | 4 ++-- frontends/src/quick_frontend/quick_blog.py | 8 ++++---- src/plugins/plugin_blog_import_dotclear.py | 4 ++-- src/plugins/plugin_misc_groupblog.py | 8 ++++---- src/plugins/plugin_xep_0277.py | 6 +++--- src/tools/{common.py => common/data_format.py} | 0 6 files changed, 15 insertions(+), 15 deletions(-) rename src/tools/{common.py => common/data_format.py} (100%) diff --git a/frontends/src/jp/cmd_blog.py b/frontends/src/jp/cmd_blog.py index 5be4a51d..de8630d5 100644 --- a/frontends/src/jp/cmd_blog.py +++ b/frontends/src/jp/cmd_blog.py @@ -32,7 +32,7 @@ import tempfile import subprocess import shlex import glob -from sat.tools import common +from sat.tools.common import data_format __commands__ = ["Blog"] @@ -187,7 +187,7 @@ class Edit(base.CommandBase, BlogCommon): # and override metadata with command-line arguments mb_data['allow_comments'] = C.boolConst(not self.args.no_comment) if self.args.tag: - common.iter2dict('tag', self.args.tag, mb_data) + data_format.iter2dict('tag', self.args.tag, mb_data) if self.args.title is not None: mb_data['title'] = self.args.title diff --git a/frontends/src/quick_frontend/quick_blog.py b/frontends/src/quick_frontend/quick_blog.py index 2eb2457c..a6b95155 100644 --- a/frontends/src/quick_frontend/quick_blog.py +++ b/frontends/src/quick_frontend/quick_blog.py @@ -25,7 +25,7 @@ log = getLogger(__name__) from sat_frontends.quick_frontend.constants import Const as C from sat_frontends.quick_frontend import quick_widgets from sat_frontends.tools import jid -from sat.tools import common +from sat.tools.common import data_format try: # FIXME: to be removed when an acceptable solution is here @@ -49,7 +49,7 @@ class Item(object): self.title = data.get('title') self.title_rich = None self.title_xhtml = data.get('title_xhtml') - self.tags = list(common.dict2iter('tag', data)) + self.tags = list(data_format.dict2iter('tag', data)) self.content = data.get('content') self.content_rich = None self.content_xhtml = data.get('content_xhtml') @@ -264,7 +264,7 @@ class Entry(EntriesManager): if value is not None: mb_data[name] = value - common.iter2dict('tag', self.item.tags, mb_data) + data_format.iter2dict('tag', self.item.tags, mb_data) if self.blog.new_message_target not in (C.PUBLIC, C.GROUP): raise NotImplementedError @@ -273,7 +273,7 @@ class Entry(EntriesManager): mb_data["allow_comments"] = C.BOOL_TRUE if self.blog.new_message_target == C.GROUP: - common.iter2dict('group', self.blog.targets, mb_data) + data_format.iter2dict('group', self.blog.targets, mb_data) self.blog.host.bridge.mbSend( unicode(self.service or ''), diff --git a/src/plugins/plugin_blog_import_dotclear.py b/src/plugins/plugin_blog_import_dotclear.py index 7e98a82c..65c3444e 100755 --- a/src/plugins/plugin_blog_import_dotclear.py +++ b/src/plugins/plugin_blog_import_dotclear.py @@ -22,7 +22,7 @@ from sat.core.constants import Const as C from sat.core.log import getLogger log = getLogger(__name__) from sat.core import exceptions -from sat.tools import common +from sat.tools.common import data_format from twisted.internet import threads from collections import OrderedDict import itertools @@ -159,7 +159,7 @@ class DotclearParser(object): def metaFinishedHandler(self): for post_id, tags in self.tags.iteritems(): - common.iter2dict('tag', tags, self.posts_data[post_id]['blog']) + data_format.iter2dict('tag', tags, self.posts_data[post_id]['blog']) del self.tags def commentHandler(self, headers, data, index): diff --git a/src/plugins/plugin_misc_groupblog.py b/src/plugins/plugin_misc_groupblog.py index f2b47c2c..a769ba4a 100755 --- a/src/plugins/plugin_misc_groupblog.py +++ b/src/plugins/plugin_misc_groupblog.py @@ -25,7 +25,7 @@ from twisted.internet import defer from sat.core import exceptions from wokkel import disco, data_form, iwokkel from zope.interface import implements -from sat.tools import common +from sat.tools.common import data_format try: from twisted.words.protocols.xmlstream import XMPPHandler @@ -102,7 +102,7 @@ class GroupBlog(object): access_model = config_form.get(self._p.OPT_ACCESS_MODEL, self._p.ACCESS_OPEN) # FIXME: ACCESS_ROSTER need to be changed to a new ACCESS_PUBLISHER_ROSTER when available if access_model == self._p.ACCESS_ROSTER: - common.iter2dict('group', config_form.fields[self._p.OPT_ROSTER_GROUPS_ALLOWED].values, microblog_data) + data_format.iter2dict('group', config_form.fields[self._p.OPT_ROSTER_GROUPS_ALLOWED].values, microblog_data) def _data2entryTrigger(self, client, mb_data, entry_elt, item_elt): """Build fine access permission if needed @@ -110,7 +110,7 @@ class GroupBlog(object): This trigger check if "group*" key are present, and create a fine item config to restrict view to these groups """ - groups = list(common.dict2iter('group', mb_data)) + groups = list(data_format.dict2iter('group', mb_data)) if not groups: return if not client.server_groupblog_available: @@ -132,7 +132,7 @@ class GroupBlog(object): if "group" in mb_data: # FIXME: ACCESS_ROSTER need to be changed to a new ACCESS_PUBLISHER_ROSTER when available options[self._p.OPT_ACCESS_MODEL] = self._p.ACCESS_ROSTER - options[self._p.OPT_ROSTER_GROUPS_ALLOWED] = list(common.dict2iter('group', mb_data)) + options[self._p.OPT_ROSTER_GROUPS_ALLOWED] = list(data_format.dict2iter('group', mb_data)) class GroupBlog_handler(XMPPHandler): diff --git a/src/plugins/plugin_xep_0277.py b/src/plugins/plugin_xep_0277.py index 572f18cb..6d7f6587 100755 --- a/src/plugins/plugin_xep_0277.py +++ b/src/plugins/plugin_xep_0277.py @@ -28,7 +28,7 @@ from twisted.python import failure from sat.core import exceptions from sat.tools import xml_tools from sat.tools import sat_defer -from sat.tools import common +from sat.tools.common import data_format # XXX: tmp.pubsub is actually use instead of wokkel version from wokkel import pubsub @@ -326,7 +326,7 @@ class XEP_0277(object): # categories categories = (category_elt.getAttribute('term','') for category_elt in entry_elt.elements(NS_ATOM, 'category')) - common.iter2dict('tag', categories, microblog_data) + data_format.iter2dict('tag', categories, microblog_data) ## the trigger ## # if other plugins have things to add or change @@ -426,7 +426,7 @@ class XEP_0277(object): content=rfc3339.timestamp_from_tf(float(data.get('published', current_time)))) ## categories ## - for tag in common.dict2iter("tag", data): + for tag in data_format.dict2iter("tag", data): category_elt = entry_elt.addElement("category") category_elt['term'] = tag diff --git a/src/tools/common.py b/src/tools/common/data_format.py similarity index 100% rename from src/tools/common.py rename to src/tools/common/data_format.py