Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

core: cleanup imports

  • Loading branch information...
commit fe0f36383191135dd2ccf4b839ef4db8365ced8e 1 parent 7edb088
Boris Faure billiob authored
5 amsn2/__init__.py
View
@@ -1,5 +1,2 @@
-import amsn2.core
-import amsn2.backend
-import amsn2.ui
-import amsn2.protocol
+#load available front ends
import amsn2.ui.front_ends
13 amsn2/core/__init__.py
View
@@ -1,7 +1,6 @@
-
-from amsn import *
-from lang import *
-from config import *
-from contactlist_manager import *
-from account_manager import *
-from personalinfo_manager import *
+from amsn import aMSNCore
+from config import aMSNConfig
+from contactlist_manager import aMSNContactListManager, aMSNContact, aMSNBaseGroup, aMSNPapyonGroup, aMSNPresenceGroup
+from account_manager import aMSNAccountManager, aMSNAccount
+from personalinfo_manager import aMSNPersonalInfoManager
+from userinterface_manager import aMSNUserInterfaceManager
5 amsn2/core/amsn.py
View
@@ -24,9 +24,8 @@
from amsn2 import protocol
from amsn2.backend import aMSNBackendManager
-from amsn2.views import *
-from account_manager import *
-from contactlist_manager import *
+from account_manager import aMSNAccount, aMSNAccountManager
+from contactlist_manager import aMSNContactListManager
from conversation_manager import *
from oim_manager import *
from theme_manager import *
2  amsn2/core/contactlist_manager.py
View
@@ -574,7 +574,7 @@ def fill(self):
self.contacts = set([ c.id for c in contacts])
self.contacts_online = set([c.id for c in contacts if c.presence != papyon.Presence.OFFLINE])
-class aMSNPreseceGroup(aMSNBaseGroup):
+class aMSNPresenceGroup(aMSNBaseGroup):
""" Group which holds the contacts according to their status """
def __init__(self, core):
aMSNBaseGroup.__init__(self, core)
2  amsn2/core/personalinfo_manager.py
View
@@ -1,4 +1,4 @@
-from amsn2.views import *
+from amsn2.views import PersonalInfoView
class aMSNPersonalInfoManager:
def __init__(self, core):
2  amsn2/core/userinterface_manager.py
View
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from amsn2.views import *
+from amsn2.views import ImageView, AccountView
import logging
logger = logging.getLogger('amsn2.ui_manager')
18 amsn2/views/__init__.py
View
@@ -1,9 +1,9 @@
-from contactlistview import *
-from keybindingview import *
-from menuview import *
-from stringview import *
-from tooltipview import *
-from messageview import *
-from imageview import *
-from accountview import *
-from personalinfoview import *
+from stringview import StringView
+from imageview import ImageView
+from menuview import MenuItemView, MenuView
+from keybindingview import KeyBindingView
+from contactlistview import ContactListView, GroupView, ContactView, ContactPopupMenu, GroupPopupMenu
+from tooltipview import TooltipView
+from messageview import MessageView
+from accountview import AccountView
+from personalinfoview import PersonalInfoView
4 amsn2/views/accountview.py
View
@@ -1,6 +1,6 @@
-from imageview import *
-from stringview import *
+from imageview import ImageView
+from stringview import StringView
class AccountView:
def __init__(self, core, email):
7 amsn2/views/contactlistview.py
View
@@ -1,6 +1,6 @@
-from stringview import *
-from imageview import *
-from menuview import *
+from stringview import StringView
+from imageview import ImageView
+from menuview import MenuView
class ContactListView:
def __init__(self):
@@ -10,7 +10,6 @@ def __repr__(self):
return "<ContactListView {group_ids=%s}>" \
% (repr(self.group_ids),)
-
class GroupView:
def __init__(self, core, amsn_group):
self.uid = amsn_group.id
Please sign in to comment.
Something went wrong with that request. Please try again.