copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some import warnings and errors pointed out by pylint

This commit is contained in:
André Apitzsch 2017-08-24 01:18:01 +02:00
parent b9363fe983
commit 663176cfc5
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gajim/common/app.py
View File

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

6
gajim/common/commands.py
View File

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

2
gajim/ipython_view.py
View File

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