Merge lp:~muktupavels/compiz/star-imports into lp:compiz/0.9.13

[Alberts Muktupāvels]

ccsm: don't use star imports.

Don't use star imports.

[lp:~muktupavels/compiz/star-imports]

4162. By Alberts Muktupāvels on 2018-07-16

Remove unused variable.

[Dmitry Shachnev (mitya57)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'compizconfig/ccsm/ccm/Conflicts.py'
--- compizconfig/ccsm/ccm/Conflicts.py	2018-07-11 21:59:31 +0000
+++ compizconfig/ccsm/ccm/Conflicts.py	2018-07-16 23:49:21 +0000
@@ -22,8 +22,8 @@
 
 from gi.repository import Gtk
 
-from ccm.Constants import *
-from ccm.Utils import *
+from ccm.Constants import DataDir
+from ccm.Utils import protect_markup_dict, GetSettings
 
 import locale
 import gettext

=== modified file 'compizconfig/ccsm/ccm/Pages.py'
--- compizconfig/ccsm/ccm/Pages.py	2018-07-12 14:25:13 +0000
+++ compizconfig/ccsm/ccm/Pages.py	2018-07-16 23:49:21 +0000
@@ -26,11 +26,15 @@
 import compizconfig
 ccs = compizconfig
 
-from ccm.Constants import *
-from ccm.Settings import *
-from ccm.Conflicts import *
-from ccm.Utils import *
-from ccm.Widgets import *
+from ccm.Constants import CurrentScreenNum, KeyModifier, HeaderMarkup, ImagePlugin, ImageCategory, ImageStock, FilterName, FilterLongDesc, FilterValue, FilterCategory, FilterAll, DataDir
+from ccm.Settings import BaseListSetting, SubGroupArea
+from ccm.Conflicts import PluginConflict
+from ccm.Utils import gtk_process_events, getScreens, Image, PrettyButton, Label, NotFoundBox, GlobalUpdater, CategoryKeyFunc, GroupIndexKeyFunc, PluginKeyFunc, GetSettings, GetAcceleratorName
+from ccm.Widgets import ClearEntry, PluginView, GroupView, SelectorButtons, ScrolledList, Popup, KeyGrabber, AboutDialog, PluginWindow
+
+from cgi import escape as protect_pango_markup
+
+import os
 
 import locale
 import gettext

=== modified file 'compizconfig/ccsm/ccm/Settings.py'
--- compizconfig/ccsm/ccm/Settings.py	2018-07-12 14:25:13 +0000
+++ compizconfig/ccsm/ccm/Settings.py	2018-07-16 23:49:21 +0000
@@ -22,13 +22,13 @@
 
 from gi.repository import Gtk
 from gi.repository import Gdk
-import os
-
-from ccm.Constants import *
-from ccm.Conflicts import *
-from ccm.Widgets import *
-from ccm.Utils import *
-from ccm.Pages import *
+
+from ccm.Constants import TableDef, TableX, KeyModifier, Edges, ImageStock, FilterName, FilterLongDesc, FilterValue, FilterAll, DataDir
+from ccm.Conflicts import KeyConflict, ButtonConflict, EdgeConflict
+from ccm.Widgets import CellRendererColor, ModifierSelector, SingleEdgeSelector, KeyGrabber, MatchButton, FileButton, ErrorDialog, WarningDialog
+from ccm.Utils import Image, ActionImage, SizedButton, GlobalUpdater, PureVirtualError, SettingKeyFunc, EnumSettingKeyFunc, HasOnlyType, GetSettings, GetAcceleratorName
+
+from cgi import escape as protect_pango_markup
 
 import locale
 import gettext
@@ -661,7 +661,7 @@
 
         self.EditDialogOpen = True
         self.EditDialog.show_all()
-        response = self.EditDialog.run()
+        self.EditDialog.run()
         self.EditDialog.hide()
         self.EditDialogOpen = False
 

=== modified file 'compizconfig/ccsm/ccm/Utils.py'
--- compizconfig/ccsm/ccm/Utils.py	2018-07-12 14:25:13 +0000
+++ compizconfig/ccsm/ccm/Utils.py	2018-07-16 23:49:21 +0000
@@ -20,17 +20,14 @@
 #          Christopher Williams ([e-mail])
 # Copyright (C) 2007 Quinn Storm
 
-import os
-
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GObject
 import weakref
 
-from ccm.Constants import *
+from ccm.Constants import ImageNone, ImagePlugin, ImageCategory, ImageThemed, ImageStock, DataDir, IconDir
 from cgi import escape as protect_pango_markup
 import operator
-import itertools
 
 import locale
 import gettext

=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
--- compizconfig/ccsm/ccm/Widgets.py	2018-07-12 14:41:42 +0000
+++ compizconfig/ccsm/ccm/Widgets.py	2018-07-16 23:49:21 +0000
@@ -26,15 +26,17 @@
 from gi.repository import PangoCairo
 from gi.repository import GdkPixbuf
 import cairo
+from cgi import escape as protect_pango_markup
 from math import pi, sqrt
 import time
+import os
 import re
 import mimetypes
 mimetypes.init()
 
-from ccm.Utils import *
-from ccm.Constants import *
-from ccm.Conflicts import *
+from ccm.Utils import IconTheme, gtk_process_events, Image, PrettyButton, Label, NotFoundBox, GlobalUpdater, PluginSetting, SettingKeyFunc, CategoryKeyFunc, PluginKeyFunc, GetSettings, GetAcceleratorName
+from ccm.Constants import TableX, TableY, ImagePlugin, ImageCategory, ImageStock, FilterName, FilterLongDesc, FilterCategory, FilterAll, DataDir, PixmapDir, ConfDir, ConfFile, Version
+from ccm.Conflicts import EdgeConflict, FeatureRequirement, PluginConflict
 
 import locale
 import gettext

=== modified file 'compizconfig/ccsm/ccm/Window.py'
--- compizconfig/ccsm/ccm/Window.py	2018-07-12 14:25:13 +0000
+++ compizconfig/ccsm/ccm/Window.py	2018-07-16 23:49:21 +0000
@@ -22,10 +22,8 @@
 
 from gi.repository import Gtk
 
-from ccm.Pages import *
-from ccm.Utils import *
-from ccm.Constants import *
-from ccm.Conflicts import *
+from ccm.Pages import PluginPage, MainPage
+from ccm.Constants import DataDir
 
 import locale
 import gettext