move sat.tools.jid to sat_frontends.tools.jid

This commit is contained in:
souliane 2014-08-26 12:52:46 +02:00
commit 987cfbf89d
19 changed files with 19 additions and 19 deletions

View file

@ -36,7 +36,7 @@ import argparse
from gi.repository import GLib, GObject from gi.repository import GLib, GObject
from glob import iglob from glob import iglob
from importlib import import_module from importlib import import_module
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat_frontends.bridge.DBus import DBusBridgeFrontend from sat_frontends.bridge.DBus import DBusBridgeFrontend
from sat.core import exceptions from sat.core import exceptions
import sat_frontends.jp import sat_frontends.jp

View file

@ -23,7 +23,7 @@ and retrieve informations about a profile."""
from logging import debug, info, error, warning from logging import debug, info, error, warning
from sat.core.i18n import _ from sat.core.i18n import _
from sat_frontends.jp import base from sat_frontends.jp import base
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
__commands__ = ["Profile"] __commands__ = ["Profile"]

View file

@ -27,7 +27,7 @@ from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePriv
from sat_frontends.primitivus import xmlui from sat_frontends.primitivus import xmlui
from sat_frontends.primitivus.constants import Const as C from sat_frontends.primitivus.constants import Const as C
import time import time
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
class ChatText(urwid.FlowWidget): class ChatText(urwid.FlowWidget):

View file

@ -22,7 +22,7 @@ import urwid
from urwid_satext import sat_widgets from urwid_satext import sat_widgets
from sat_frontends.quick_frontend.quick_contact_list import QuickContactList from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat_frontends.primitivus.status import StatusBar from sat_frontends.primitivus.status import StatusBar
from sat_frontends.primitivus.constants import Const from sat_frontends.primitivus.constants import Const
@ -79,7 +79,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
def setFocus(self, text, select=False): def setFocus(self, text, select=False):
"""give focus to the first element that matches the given text. You can also """give focus to the first element that matches the given text. You can also
pass in text a sat.tools.jid.JID (it's a subclass of unicode). pass in text a sat_frontends.tools.jid.JID (it's a subclass of unicode).
@param text: contact group name, contact or muc userhost, muc private dialog jid @param text: contact group name, contact or muc userhost, muc private dialog jid
@param select: if True, the element is also clicked @param select: if True, the element is also clicked
""" """

View file

@ -38,7 +38,7 @@ from sat_frontends.primitivus.progress import Progress
from sat_frontends.primitivus.notify import Notify from sat_frontends.primitivus.notify import Notify
from sat_frontends.tools.misc import InputHistory from sat_frontends.tools.misc import InputHistory
from sat_frontends.constants import Const as commonConst # FIXME from sat_frontends.constants import Const as commonConst # FIXME
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from os.path import join from os.path import join

View file

@ -21,7 +21,7 @@ from sat.core.i18n import _
from sat_frontends.primitivus.constants import Const as C from sat_frontends.primitivus.constants import Const as C
import urwid import urwid
from urwid_satext.sat_widgets import AdvancedEdit, Password, List, InputDialog, ConfirmDialog, Alert from urwid_satext.sat_widgets import AdvancedEdit, Password, List, InputDialog, ConfirmDialog, Alert
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
class ProfileManager(urwid.WidgetWrap): class ProfileManager(urwid.WidgetWrap):

View file

@ -22,4 +22,4 @@ from sat_frontends import constants
class Const(constants.Const): class Const(constants.Const):
PRIVATE_PREFIX = "@PRIVATE@" PRIVATE_PREFIX = "@private@"

View file

@ -21,7 +21,7 @@ from sat.core.i18n import _
import sys import sys
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat_frontends.bridge.DBus import DBusBridgeFrontend from sat_frontends.bridge.DBus import DBusBridgeFrontend
from sat.core import exceptions from sat.core import exceptions
from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate

View file

@ -19,7 +19,7 @@
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID

View file

@ -20,7 +20,7 @@
from sat.core.i18n import _ from sat.core.i18n import _
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat_frontends.quick_frontend.quick_utils import unescapePrivate from sat_frontends.quick_frontend.quick_utils import unescapePrivate
from sat_frontends.quick_frontend.constants import Const from sat_frontends.quick_frontend.constants import Const

View file

@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
class QuickChatList(dict): class QuickChatList(dict):

View file

@ -20,7 +20,7 @@
from sat.core.i18n import _ from sat.core.i18n import _
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
class QuickContactManagement(object): class QuickContactManagement(object):

View file

@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from os.path import exists, splitext from os.path import exists, splitext
from sat_frontends.quick_frontend.constants import Const from sat_frontends.quick_frontend.constants import Const

View file

@ -0,0 +1,48 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# SAT: a jabber client
# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
class JID(unicode):
"""This class help manage JID (Node@Domaine/Resource)"""
def __new__(cls, jid):
self = unicode.__new__(cls, jid)
self.__parse()
return self
def __parse(self):
"""find node domain and resource"""
node_end = self.find('@')
if node_end < 0:
node_end = 0
domain_end = self.find('/')
if domain_end < 1:
domain_end = len(self)
self.node = self[:node_end]
self.domain = self[(node_end + 1) if node_end else 0:domain_end]
self.resource = self[domain_end + 1:]
if not node_end:
self.bare = self
else:
self.bare = self.node + '@' + self.domain
def is_valid(self):
"""return True if the jid is xmpp compliant"""
#TODO: implement real check, according to RFCs
return self.domain != ""

View file

@ -25,7 +25,7 @@ import os.path
import time import time
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat_frontends.quick_frontend.quick_chat import QuickChat from sat_frontends.quick_frontend.quick_chat import QuickChat
from sat_frontends.wix.contact_list import ContactList from sat_frontends.wix.contact_list import ContactList
from sat_frontends.wix.card_game import CardPanel from sat_frontends.wix.card_game import CardPanel

View file

@ -24,7 +24,7 @@ from sat_frontends.wix.constants import Const
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from cgi import escape from cgi import escape
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from os.path import join from os.path import join

View file

@ -29,7 +29,7 @@ from sat_frontends.wix import xmlui
from sat_frontends.wix.profile import Profile from sat_frontends.wix.profile import Profile
from sat_frontends.wix.profile_manager import ProfileManager from sat_frontends.wix.profile_manager import ProfileManager
import os.path import os.path
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat_frontends.wix.constants import Const from sat_frontends.wix.constants import Const

View file

@ -22,7 +22,7 @@ import wx
import pdb import pdb
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
class Profile(wx.Frame): class Profile(wx.Frame):

View file

@ -25,7 +25,7 @@ import os.path, glob
import pdb import pdb
from sat.core.log import getLogger from sat.core.log import getLogger
log = getLogger(__name__) log = getLogger(__name__)
from sat.tools.jid import JID from sat_frontends.tools.jid import JID
from time import time from time import time
from math import sin, cos, pi from math import sin, cos, pi