Merge branch 'imports' into 'master'

fix some import warnings and errors pointed out by pylint

See merge request !121
This commit is contained in:
Philipp Hörist 2017-08-24 14:44:36 +02:00
commit 94cbccecb1
3 changed files with 9 additions and 11 deletions

View File

@ -30,13 +30,16 @@
import os
import logging
import locale
import gi
import uuid
from distutils.version import LooseVersion as V
import gi
import nbxmpp
from gajim.common import config
import nbxmpp
from gajim.common import configpaths
from gajim.common import ged as ged_module
from gajim.common.contacts import LegacyContactsAPI
from gajim.common.events import Events
interface = None # The actual interface (the gtk one for the moment)
thread_interface = None # Interface to run a thread and then a callback
@ -54,7 +57,6 @@ log = logging.getLogger('gajim')
logger = None
from gajim.common import configpaths
gajimpaths = configpaths.gajimpaths
VCARD_PATH = gajimpaths['VCARD']
@ -86,9 +88,6 @@ else:
os_info = None # used to cache os information
from gajim.common.contacts import LegacyContactsAPI
from gajim.common.events import Events
gmail_domains = ['gmail.com', 'googlemail.com']
transport_type = {} # list the type of transport
@ -182,7 +181,6 @@ try:
except ImportError:
HAVE_GPG = False
else:
import os
import subprocess
def test_gpg(binary='gpg'):
if os.name == 'nt':

View File

@ -163,11 +163,11 @@ class ChangeStatusCommand(AdHocCommand):
return False # finish the session
def find_current_groupchats(account):
import message_control
from gajim import message_control
rooms = []
for gc_control in app.interface.msg_win_mgr.get_controls(
message_control.TYPE_GC) + app.interface.minimized_controls[account].\
values():
message_control.TYPE_GC) + \
app.interface.minimized_controls[account].values():
acct = gc_control.account
# check if account is the good one
if acct != account:

View File

@ -52,7 +52,7 @@ import re
import sys
import os
from gi.repository import Pango
from StringIO import StringIO
from io import StringIO
try:
import IPython