Philipp Hörist pushed to branch master at gajim / gajim
Commits: ac4859fb by Philipp Hörist at 2016-12-22T18:19:24+01:00 Remove unused imports
- - - - -
28 changed files:
- src/chat_control.py - src/common/caps_cache.py - src/common/check_paths.py - src/common/config.py - src/common/dbus_support.py - src/common/fuzzyclock.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle_rtp.py - src/common/logging_helpers.py - src/common/multimedia_helpers.py - src/common/optparser.py - src/common/resolver.py - src/common/sleepy.py - src/config.py - src/conversation_textview.py - src/dialogs.py - src/disco.py - src/features_window.py - src/gtkgui_helpers.py - src/history_manager.py - src/htmltextview.py - src/message_textview.py - src/network_manager_listener.py - src/notify.py - src/roster_window.py - src/statusicon.py - src/tooltips.py
Changes:
===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -29,9 +29,6 @@
import os import time -import gi -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -58,7 +55,6 @@ from message_textview import MessageTextView from common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from common.contacts import GC_Contact from common.logger import constants -from common.pep import MOODS, ACTIVITIES from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO
===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -38,7 +38,7 @@ import logging log = logging.getLogger('gajim.c.caps_cache')
from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION,
===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -26,7 +26,6 @@ import os import shutil import sys -import stat
from common import gajim from common import logger
===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -32,9 +32,7 @@ ##
-import sys import re -import copy from common import defs from gi.repository import GLib
===================================== src/common/dbus_support.py ===================================== --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -24,7 +24,7 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/. ##
-import os, sys +import os
from common import gajim from common import exceptions
===================================== src/common/fuzzyclock.py ===================================== --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -32,7 +32,6 @@ in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE). So most of the credit goes to this guys, thanks :-) """
-import time
class FuzzyClock: HOUR_NAMES = [ _('twelve'), _('one'), _('two'), _('three'), _('four'),
===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -27,7 +27,6 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/. ##
-import sys import os import logging import locale @@ -201,10 +200,6 @@ try: from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst - gi.require_version('GdkX11', '3.0') - from gi.repository import GdkX11 - gi.require_version('GstVideo', '1.0') - from gi.repository import GstVideo from gi.repository import GLib try: Gst.init(None)
===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -31,7 +31,6 @@
import sys import re -import locale import os import subprocess import urllib
===================================== src/common/jingle_rtp.py ===================================== --- a/src/common/jingle_rtp.py +++ b/src/common/jingle_rtp.py @@ -17,20 +17,13 @@ Handles Jingle RTP sessions (XEP 0167) """
-from collections import deque - -from gi.repository import GLib import socket - import nbxmpp -from gi.repository import Farstream import gi +from gi.repository import Farstream + gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo from gi.repository import GLib
from common import gajim @@ -40,6 +33,7 @@ from common.jingle_content import contents, JingleContent, JingleContentSetupExc from common.connection_handlers_events import InformationEvent from common.jingle_session import FailedApplication
+from collections import deque
import logging log = logging.getLogger('gajim.c.jingle_rtp')
===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -19,7 +19,6 @@ ##
import logging -from common import i18n
def parseLogLevel(arg): """
===================================== src/common/multimedia_helpers.py ===================================== --- a/src/common/multimedia_helpers.py +++ b/src/common/multimedia_helpers.py @@ -16,10 +16,6 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo
class DeviceManager(object):
===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -28,7 +28,6 @@
import os import sys -import locale import re from time import time from common import gajim
===================================== src/common/resolver.py ===================================== --- a/src/common/resolver.py +++ b/src/common/resolver.py @@ -18,8 +18,6 @@ ##
import sys -import os -import re import logging import functools log = logging.getLogger('gajim.c.resolver') @@ -30,8 +28,6 @@ if __name__ == '__main__': import common.configpaths common.configpaths.gajimpaths.init(None)
-from common import helpers -from nbxmpp.idlequeue import IdleCommand from gi.repository import Gio, GLib
@@ -132,7 +128,6 @@ class GioResolver(CommonResolver):
# below lines is on how to use API and assist in testing if __name__ == '__main__': - from gi.repository import GLib from gi.repository import Gtk from nbxmpp import idlequeue
===================================== src/common/sleepy.py ===================================== --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -23,7 +23,6 @@
from common import gajim import os -import sys
STATE_UNKNOWN = 'OS probably not supported'
===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -36,7 +36,7 @@ from gi.repository import Gdk from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib -import os, sys +import os import common.config import common.sleepy from common.i18n import Q_
===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -39,7 +39,6 @@ import time import os import tooltips import dialogs -import locale import queue import urllib
===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -42,7 +42,6 @@ import time import gtkgui_helpers import vcard import conversation_textview -import message_control import dataforms_widget
from common import defs
===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -44,7 +44,6 @@ # the functionality) # There are more methods, of course, but this is a basic set.
-import os import types import weakref from gi.repository import GLib
===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -24,7 +24,6 @@ ##
import os -import sys import gi from gi.repository import Gtk import gtkgui_helpers
===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -36,13 +36,11 @@ from gi.repository import GLib from gi.repository import Pango import os import sys -import importlib try: from PIL import Image except: pass from io import BytesIO -import array
import logging log = logging.getLogger('gajim.gtkgui_helpers')
===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -52,7 +52,6 @@ import signal import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk -gi.require_version('GdkX11', '3.0') from gi.repository import Gdk from gi.repository import GLib import time
===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -41,11 +41,11 @@ from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -import xml.sax, xml.sax.handler +import xml.sax +import xml.sax.handler import re from io import StringIO import urllib -import operator
if __name__ == '__main__': from common import i18n
===================================== src/message_textview.py ===================================== --- a/src/message_textview.py +++ b/src/message_textview.py @@ -24,12 +24,10 @@ import gc
from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GObject from gi.repository import GLib from gi.repository import Pango
-import gtkgui_helpers from common import gajim
class MessageTextView(Gtk.TextView):
===================================== src/network_manager_listener.py ===================================== --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -21,7 +21,6 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/. ##
-import sys from common import gajim
===================================== src/notify.py ===================================== --- a/src/notify.py +++ b/src/notify.py @@ -33,7 +33,6 @@ from dialogs import PopupNotificationWindow from gi.repository import GObject from gi.repository import GLib import gtkgui_helpers -from gi.repository import Gtk
from common import gajim from common import helpers
===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -74,7 +74,6 @@ if dbus_support.supported: import dbus
from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE -from common.pep import MOODS, ACTIVITIES
#(icon, name, type, jid, account, editable, second pixbuf) (
===================================== src/statusicon.py ===================================== --- a/src/statusicon.py +++ b/src/statusicon.py @@ -23,7 +23,6 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/. ##
-import sys from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -33,7 +32,6 @@ import dialogs import config import tooltips import gtkgui_helpers -import tooltips
from common import gajim from common import helpers
===================================== src/tooltips.py ===================================== --- a/src/tooltips.py +++ b/src/tooltips.py @@ -33,7 +33,6 @@ from gi.repository import Gdk from gi.repository import GLib import os import time -import locale from datetime import datetime from datetime import timedelta
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4859fb87ef74564e1514a87890316165b...
-
Philipp Hörist