From f62f92273395971f043042b83f42ad6cb3c13998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 7 Apr 2019 20:27:07 +0200
Subject: [PATCH] Fix unused-wildcard-import pylint errors

---
 gajim/common/zeroconf/zeroconf_avahi.py       | 16 ++++++++++++----
 gajim/common/zeroconf/zeroconf_avahi_const.py |  7 -------
 gajim/dialogs.py                              |  6 ++++--
 scripts/dev/pylint-ci.sh                      |  3 +--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/gajim/common/zeroconf/zeroconf_avahi.py b/gajim/common/zeroconf/zeroconf_avahi.py
index 44c74e51f..e09510da8 100644
--- a/gajim/common/zeroconf/zeroconf_avahi.py
+++ b/gajim/common/zeroconf/zeroconf_avahi.py
@@ -15,17 +15,25 @@
 # along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-log = logging.getLogger('gajim.c.z.zeroconf_avahi')
 
-import gi
-gi.require_version('Avahi', '0.6')
 from gi.repository import Avahi
 from gi.repository import Gio
 from gi.repository import GLib
 
 from gajim.common.i18n import _
 from gajim.common.zeroconf.zeroconf import Constant, ConstantRI
-from gajim.common.zeroconf.zeroconf_avahi_const import *
+from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_NAME
+from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_SERVER
+from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_ENTRY_GROUP
+from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_DOMAIN_BROWSER
+from gajim.common.zeroconf.zeroconf_avahi_const import ServerState
+from gajim.common.zeroconf.zeroconf_avahi_const import EntryGroup
+from gajim.common.zeroconf.zeroconf_avahi_const import DomainBrowser
+from gajim.common.zeroconf.zeroconf_avahi_const import Protocol
+from gajim.common.zeroconf.zeroconf_avahi_const import Interface
+
+log = logging.getLogger('gajim.c.z.zeroconf_avahi')
+
 
 class Zeroconf:
     def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB,
diff --git a/gajim/common/zeroconf/zeroconf_avahi_const.py b/gajim/common/zeroconf/zeroconf_avahi_const.py
index f1438fabd..b2cb7fe6b 100644
--- a/gajim/common/zeroconf/zeroconf_avahi_const.py
+++ b/gajim/common/zeroconf/zeroconf_avahi_const.py
@@ -20,15 +20,8 @@ from enum import IntEnum
 
 DBUS_NAME = "org.freedesktop.Avahi"
 DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
-DBUS_PATH_SERVER = "/"
 DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 DBUS_INTERFACE_DOMAIN_BROWSER = DBUS_NAME + ".DomainBrowser"
-DBUS_INTERFACE_SERVICE_TYPE_BROWSER = DBUS_NAME + ".ServiceTypeBrowser"
-DBUS_INTERFACE_SERVICE_BROWSER = DBUS_NAME + ".ServiceBrowser"
-DBUS_INTERFACE_ADDRESS_RESOLVER = DBUS_NAME + ".AddressResolver"
-DBUS_INTERFACE_HOST_NAME_RESOLVER = DBUS_NAME + ".HostNameResolver"
-DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver"
-DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser"
 
 
 class ServerState(IntEnum):
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index a037c18a6..8626815b8 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -50,8 +50,10 @@ from gajim.common import i18n
 from gajim.common.modules import dataforms
 from gajim.common.exceptions import GajimGeneralException
 
-# Compat with Gajim 1.0.3 for plugins
-from gajim.gtk.dialogs import *
+from gajim.gtk.dialogs import ErrorDialog
+from gajim.gtk.dialogs import ConfirmationDialog
+from gajim.gtk.dialogs import InputDialog
+from gajim.gtk.dialogs import InformationDialog
 from gajim.gtk.util import get_icon_name
 from gajim.gtk.util import resize_window
 from gajim.gtk.util import get_builder
diff --git a/scripts/dev/pylint-ci.sh b/scripts/dev/pylint-ci.sh
index 97ecfbcb1..c665a0d45 100755
--- a/scripts/dev/pylint-ci.sh
+++ b/scripts/dev/pylint-ci.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PYLINT=${PYLINT:-pylint}
 
-"$PYLINT" --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 "$@"
+"$PYLINT" --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613 "$@"
 
 # C0103 invalid-name
 # C0302 too-many-lines
@@ -32,4 +32,3 @@ PYLINT=${PYLINT:-pylint}
 # W0401 wildcard-import
 # W0603 global-statement
 # W0613 unused-argument
-# W0614 unused-wildcard-import