[gedit] Move gi.require_version in the __init__ files



commit 65f1ba7eb37166159e30e0700ac1cc19a02c066f
Author: Paolo Borelli <pborelli gnome org>
Date:   Mon Aug 17 09:52:18 2015 +0200

    Move gi.require_version in the __init__ files

 plugins/externaltools/tools/__init__.py          |    4 ++++
 plugins/externaltools/tools/appactivatable.py    |    2 --
 plugins/externaltools/tools/windowactivatable.py |    5 +----
 plugins/pythonconsole/pythonconsole/__init__.py  |    7 ++++---
 plugins/quickopen/quickopen/__init__.py          |    5 ++++-
 plugins/quickopen/quickopen/popup.py             |    4 ----
 plugins/snippets/snippets/__init__.py            |    4 ++++
 plugins/snippets/snippets/appactivatable.py      |    6 ++----
 plugins/snippets/snippets/windowactivatable.py   |    4 +---
 9 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/plugins/externaltools/tools/__init__.py b/plugins/externaltools/tools/__init__.py
index e2ef029..0cc0b4f 100644
--- a/plugins/externaltools/tools/__init__.py
+++ b/plugins/externaltools/tools/__init__.py
@@ -16,6 +16,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import gi
+gi.require_version('Gedit', '3.0')
+gi.require_version('Gtk', '3.0')
+
 from .appactivatable import AppActivatable
 from .windowactivatable import WindowActivatable
 
diff --git a/plugins/externaltools/tools/appactivatable.py b/plugins/externaltools/tools/appactivatable.py
index 74f2a78..0724065 100644
--- a/plugins/externaltools/tools/appactivatable.py
+++ b/plugins/externaltools/tools/appactivatable.py
@@ -16,8 +16,6 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import GLib, Gio, GObject, Gtk, Gdk, Gedit
 from .library import ToolLibrary
 from .manager import Manager
diff --git a/plugins/externaltools/tools/windowactivatable.py 
b/plugins/externaltools/tools/windowactivatable.py
index ef1971b..c4fd60a 100644
--- a/plugins/externaltools/tools/windowactivatable.py
+++ b/plugins/externaltools/tools/windowactivatable.py
@@ -18,10 +18,7 @@
 
 __all__ = ('ExternalToolsPlugin', 'OutputPanel', 'Capture', 'UniqueById')
 
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('PeasGtk', '1.0')
-from gi.repository import GLib, Gio, GObject, Gtk, Gedit, PeasGtk
+from gi.repository import GLib, Gio, GObject, Gtk, Gedit
 from .library import ToolLibrary
 from .outputpanel import OutputPanel
 from .capture import Capture
diff --git a/plugins/pythonconsole/pythonconsole/__init__.py b/plugins/pythonconsole/pythonconsole/__init__.py
index eb218fd..43e6539 100644
--- a/plugins/pythonconsole/pythonconsole/__init__.py
+++ b/plugins/pythonconsole/pythonconsole/__init__.py
@@ -24,15 +24,16 @@
 #     Copyrignt (C), 2005 Raphaƫl Slinckx
 
 import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('PeasGtk', '1.0')
 gi.require_version('Gedit', '3.0')
 gi.require_version('Peas', '1.0')
-from gi.repository import GObject, Gtk, Gedit, Peas, PeasGtk
+gi.require_version('PeasGtk', '1.0')
+gi.require_version('Gtk', '3.0')
 
+from gi.repository import GObject, Gtk, Gedit, Peas, PeasGtk
 from .console import PythonConsole
 from .config import PythonConsoleConfigWidget
 
+
 class PythonConsolePlugin(GObject.Object, Gedit.WindowActivatable, PeasGtk.Configurable):
     __gtype_name__ = "PythonConsolePlugin"
 
diff --git a/plugins/quickopen/quickopen/__init__.py b/plugins/quickopen/quickopen/__init__.py
index 41373e9..7d63126 100644
--- a/plugins/quickopen/quickopen/__init__.py
+++ b/plugins/quickopen/quickopen/__init__.py
@@ -15,11 +15,14 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from .popup import Popup
 import os
+
 import gi
+gi.require_version('Gedit', '3.0')
 gi.require_version('Gtk', '3.0')
 from gi.repository import GObject, Gio, GLib, Gtk, Gedit
+
+from .popup import Popup
 from .virtualdirs import RecentDocumentsDirectory
 from .virtualdirs import CurrentDocumentsDirectory
 
diff --git a/plugins/quickopen/quickopen/popup.py b/plugins/quickopen/quickopen/popup.py
index c87679b..ff11354 100644
--- a/plugins/quickopen/quickopen/popup.py
+++ b/plugins/quickopen/quickopen/popup.py
@@ -20,10 +20,6 @@ import platform
 import functools
 import fnmatch
 
-import gi
-gi.require_version('Pango', '1.0')
-gi.require_version('Gtk', '3.0')
-gi.require_version('Gedit', '3.0')
 from gi.repository import GLib, Gio, GObject, Pango, Gtk, Gdk, Gedit
 import xml.sax.saxutils
 from .virtualdirs import VirtualDirectory
diff --git a/plugins/snippets/snippets/__init__.py b/plugins/snippets/snippets/__init__.py
index c161df8..147aa69 100644
--- a/plugins/snippets/snippets/__init__.py
+++ b/plugins/snippets/snippets/__init__.py
@@ -15,6 +15,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import gi
+gi.require_version('Gedit', '3.0')
+gi.require_version('Gtk', '3.0')
+
 from .appactivatable import AppActivatable
 from .windowactivatable import WindowActivatable
 from .document import Document
diff --git a/plugins/snippets/snippets/appactivatable.py b/plugins/snippets/snippets/appactivatable.py
index f4568a6..7a17eaa 100644
--- a/plugins/snippets/snippets/appactivatable.py
+++ b/plugins/snippets/snippets/appactivatable.py
@@ -16,14 +16,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gedit, Gtk, Gdk, GObject, Gio, GLib
 import platform
-
+from gi.repository import Gedit, Gtk, Gdk, GObject, Gio, GLib
 from .library import Library
 from .shareddata import SharedData
 
+
 class AppActivatable(GObject.Object, Gedit.AppActivatable):
     __gtype_name__ = "GeditSnippetsAppActivatable"
 
diff --git a/plugins/snippets/snippets/windowactivatable.py b/plugins/snippets/snippets/windowactivatable.py
index 41c96c2..6729a69 100644
--- a/plugins/snippets/snippets/windowactivatable.py
+++ b/plugins/snippets/snippets/windowactivatable.py
@@ -15,15 +15,13 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gedit, GObject
-
 from .snippet import Snippet
 from .library import Library
 from .shareddata import SharedData
 from .signals import Signals
 
+
 class Message(Gedit.Message):
     view = GObject.Property(type=Gedit.View)
     iter = GObject.Property(type=Gtk.TextIter)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]