[meld] Modernise our import statements

From: Kai Willadsen <kaiw src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Modernise our import statements
Date: Fri, 30 Nov 2012 19:28:41 +0000 (UTC)
commit 8c49e2e15bf9a85d014cc9a351de4afde88d408f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Oct 26 06:18:50 2012 +1000

    Modernise our import statements

 meld/diffutil.py        |    2 +-
 meld/dirdiff.py         |   27 ++++++++++++++-------------
 meld/filediff.py        |   28 ++++++++++++++--------------
 meld/filemerge.py       |    6 +++---
 meld/linkmap.py         |    2 +-
 meld/meldapp.py         |    4 ++--
 meld/meldbuffer.py      |    6 +++---
 meld/melddoc.py         |    2 +-
 meld/meldwindow.py      |   26 +++++++++++++-------------
 meld/merge.py           |    5 ++---
 meld/patchdialog.py     |    6 +++---
 meld/preferences.py     |   18 +++++++++---------
 meld/ui/findbar.py      |    8 +++++---
 meld/ui/gladesupport.py |    6 +++---
 meld/ui/gnomeglade.py   |    2 +-
 meld/ui/listwidget.py   |    2 +-
 meld/ui/msgarea.py      |    2 +-
 meld/vc/__init__.py     |    2 +-
 meld/vc/_null.py        |    2 +-
 meld/vc/bzr.py          |    6 ++++--
 meld/vc/cdv.py          |    5 +++--
 meld/vc/cvs.py          |    3 ++-
 meld/vc/darcs.py        |    3 ++-
 meld/vc/fossil.py       |    5 +++--
 meld/vc/git.py          |    6 ++++--
 meld/vc/mercurial.py    |    5 +++--
 meld/vc/monotone.py     |    6 ++++--
 meld/vc/rcs.py          |    4 +++-
 meld/vc/svk.py          |    3 ++-
 meld/vc/svn.py          |    5 +++--
 meld/vc/svn_17.py       |    2 +-
 meld/vc/tla.py          |    6 ++++--
 meld/vcview.py          |   16 ++++++++--------
 33 files changed, 125 insertions(+), 106 deletions(-)
---
diff --git a/meld/diffutil.py b/meld/diffutil.py
index 5077a60..28fae69 100644
--- a/meld/diffutil.py
+++ b/meld/diffutil.py
@@ -20,7 +20,7 @@ import difflib
 
 import gobject
 
-from matchers import DiffChunk, MyersSequenceMatcher
+from .matchers import DiffChunk, MyersSequenceMatcher
 
 
 opcode_reverse = {
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 987e845..f5ff4c1 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -19,25 +19,26 @@
 import collections
 import copy
 import errno
-import paths
-from ui import gnomeglade
-import gtk
-import gtk.keysyms
-import misc
 import os
-from gettext import gettext as _
-from gettext import ngettext
-import shutil
-import melddoc
-import tree
 import re
+import shutil
 import stat
 import time
 
-import ui.emblemcellrenderer
+import gtk
+import gtk.keysyms
+
+from . import melddoc
+from . import tree
+from . import misc
+from . import paths
+from .ui import gnomeglade
+from .ui import emblemcellrenderer
 
 from collections import namedtuple
-from meldapp import app
+from gettext import gettext as _
+from gettext import ngettext
+from .meldapp import app
 
 gdk = gtk.gdk
 
@@ -294,7 +295,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
             self.treeview[i].get_selection().set_mode(gtk.SELECTION_MULTIPLE)
             column = gtk.TreeViewColumn()
             rentext = gtk.CellRendererText()
-            renicon = ui.emblemcellrenderer.EmblemCellRenderer()
+            renicon = emblemcellrenderer.EmblemCellRenderer()
             column.pack_start(renicon, expand=0)
             column.pack_start(rentext, expand=1)
             col_index = self.model.column_index
diff --git a/meld/filediff.py b/meld/filediff.py
index 24f9730..d82b29e 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -32,20 +32,20 @@ import gobject
 import gtk
 import gtk.keysyms
 
-import diffutil
-from ui import findbar
-from ui import gnomeglade
-import matchers
-import misc
-import meldbuffer
-import melddoc
-import patchdialog
-import paths
-import merge
-import undo
-
-from meldapp import app
-from util.sourceviewer import srcviewer
+from . import diffutil
+from . import matchers
+from . import meldbuffer
+from . import melddoc
+from . import merge
+from . import misc
+from . import patchdialog
+from . import paths
+from . import undo
+from .ui import findbar
+from .ui import gnomeglade
+
+from .meldapp import app
+from .util.sourceviewer import srcviewer
 
 
 def init_worker():
diff --git a/meld/filemerge.py b/meld/filemerge.py
index 3da7243..4077a6c 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -20,9 +20,9 @@ from gettext import gettext as _
 
 import gtk
 
-import filediff
-import meldbuffer
-import merge
+from . import filediff
+from . import meldbuffer
+from . import merge
 
 
 class FileMerge(filediff.FileDiff):
diff --git a/meld/linkmap.py b/meld/linkmap.py
index c55ad23..779fc16 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -21,7 +21,7 @@ import math
 
 import gtk
 
-import diffutil
+from . import diffutil
 
 
 # FIXME: import order issues
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 18b150b..53e1c32 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -149,6 +149,6 @@ class MeldApp(gobject.GObject):
 
 app = MeldApp()
 
-import filediff
-import meldwindow
+from . import filediff
+from . import meldwindow
 
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 8216cf5..d3bb477 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -19,15 +19,15 @@
 import sys
 from gettext import gettext as _
 
-import meld.util.sourceviewer
+from .util import sourceviewer
 
 
-class MeldBuffer(meld.util.sourceviewer.srcviewer.GtkTextBuffer):
+class MeldBuffer(sourceviewer.srcviewer.GtkTextBuffer):
 
     __gtype_name__ = "MeldBuffer"
 
     def __init__(self, filename=None):
-        meld.util.sourceviewer.srcviewer.GtkTextBuffer.__init__(self)
+        sourceviewer.srcviewer.GtkTextBuffer.__init__(self)
         self.data = MeldBufferData(filename)
 
     def reset_buffer(self, filename):
diff --git a/meld/melddoc.py b/meld/melddoc.py
index 9d53d59..9b7ede7 100644
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@ -25,7 +25,7 @@ import gobject
 import gio
 import gtk
 
-import task
+from . import task
 
 from gettext import gettext as _
 
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 2ef4eba..c4d0ea2 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -23,19 +23,19 @@ import gio
 import gtk
 import gobject
 
-import dirdiff
-import filediff
-import filemerge
-import paths
-from ui import gnomeglade
-import misc
-from ui import notebooklabel
-import preferences
-import task
-import vcview
-
-from util.sourceviewer import srcviewer
-from meldapp import app
+from . import dirdiff
+from . import filediff
+from . import filemerge
+from . import misc
+from . import paths
+from . import preferences
+from . import task
+from . import vcview
+from .ui import gnomeglade
+from .ui import notebooklabel
+
+from .util.sourceviewer import srcviewer
+from .meldapp import app
 
 ################################################################################
 #
diff --git a/meld/merge.py b/meld/merge.py
index 1f39996..a2bb533 100644
--- a/meld/merge.py
+++ b/meld/merge.py
@@ -15,9 +15,8 @@
 ### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 ### USA.
 
-import diffutil
-import matchers
-#from _patiencediff_py import PatienceSequenceMatcher_py as PatienceSequenceMatcher
+from . import diffutil
+from . import matchers
 
 
 class AutoMergeDiffer(diffutil.Differ):
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index c7ed846..c3e81c3 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -23,10 +23,10 @@ import os
 import gtk
 import pango
 
-from ui import gnomeglade
-import paths
+from . import paths
+from .ui import gnomeglade
 
-from util.sourceviewer import srcviewer
+from .util.sourceviewer import srcviewer
 
 
 class PatchDialog(gnomeglade.Component):
diff --git a/meld/preferences.py b/meld/preferences.py
index 287b58f..4c61022 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -21,15 +21,15 @@ from gettext import gettext as _
 
 import gtk
 
-from ui import gnomeglade
-from ui import listwidget
-import filters
-import misc
-import paths
-from util import prefs
-import vc
-
-from util.sourceviewer import srcviewer
+from . import filters
+from . import misc
+from . import paths
+from . import vc
+from .ui import gnomeglade
+from .ui import listwidget
+from .util import prefs
+
+from .util.sourceviewer import srcviewer
 
 
 class FilterList(listwidget.ListWidget):
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index b79b518..aa3b268 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -16,11 +16,13 @@
 ### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 ### USA.
 
-import gnomeglade
-from meld import paths
-from meld import misc
 import gtk
 import re
+
+from meld import misc
+from meld import paths
+from . import gnomeglade
+
 from gettext import gettext as _
 
 class FindBar(gnomeglade.Component):
diff --git a/meld/ui/gladesupport.py b/meld/ui/gladesupport.py
index f542307..4102367 100644
--- a/meld/ui/gladesupport.py
+++ b/meld/ui/gladesupport.py
@@ -1,7 +1,7 @@
 
-import historyentry
-import msgarea
-import statusbar
+from . import historyentry
+from . import msgarea
+from . import statusbar
 import meld.linkmap
 import meld.diffmap
 import meld.util.sourceviewer
diff --git a/meld/ui/gnomeglade.py b/meld/ui/gnomeglade.py
index 4411069..fdd9d95 100644
--- a/meld/ui/gnomeglade.py
+++ b/meld/ui/gnomeglade.py
@@ -114,4 +114,4 @@ def connect_signal_handlers(obj):
                    ' as a signal handler' % (attr,))
 
 
-import gladesupport
+from . import gladesupport
diff --git a/meld/ui/listwidget.py b/meld/ui/listwidget.py
index 95569bd..17c8e52 100644
--- a/meld/ui/listwidget.py
+++ b/meld/ui/listwidget.py
@@ -17,8 +17,8 @@
 ### USA.
 
 
-import gnomeglade
 from meld import paths
+from . import gnomeglade
 
 
 class ListWidget(gnomeglade.Component):
diff --git a/meld/ui/msgarea.py b/meld/ui/msgarea.py
index e2b669a..3259515 100644
--- a/meld/ui/msgarea.py
+++ b/meld/ui/msgarea.py
@@ -22,7 +22,7 @@ import logging
 import gobject
 import gtk
 
-from wraplabel import WrapLabel
+from .wraplabel import WrapLabel
 
 _logger = logging.getLogger("hotwire.ui.MsgArea")
 
diff --git a/meld/vc/__init__.py b/meld/vc/__init__.py
index 29817b6..47ac860 100644
--- a/meld/vc/__init__.py
+++ b/meld/vc/__init__.py
@@ -23,7 +23,7 @@
 
 import os
 import glob
-import _null
+from . import _null
 
 def load_plugins():
     _vcdir = os.path.dirname(os.path.abspath(__file__))
diff --git a/meld/vc/_null.py b/meld/vc/_null.py
index e8e8326..cfad1b6 100644
--- a/meld/vc/_null.py
+++ b/meld/vc/_null.py
@@ -21,7 +21,7 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import _vc
+from . import _vc
 
 class Vc(_vc.Vc):
 
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 7f9eacb..a5cbdeb 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -22,11 +22,13 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
 import errno
-import _vc
+import os
 import re
 
+from . import _vc
+
+
 class Vc(_vc.CachedVc):
 
     CMD = "bzr"
diff --git a/meld/vc/cdv.py b/meld/vc/cdv.py
index a9f8847..e75a643 100644
--- a/meld/vc/cdv.py
+++ b/meld/vc/cdv.py
@@ -21,8 +21,9 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import _vc
-import svn
+from . import _vc
+from . import svn
+
 
 class Vc(svn.Vc):
 
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index a1225d9..7bbbe6d 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -25,8 +25,9 @@ import os
 from gettext import gettext as _
 import re
 import time
+
 from meld import misc
-import _vc
+from . import _vc
 
 class Vc(_vc.Vc):
     CMD = "cvs"
diff --git a/meld/vc/darcs.py b/meld/vc/darcs.py
index 8180215..b3e95c7 100644
--- a/meld/vc/darcs.py
+++ b/meld/vc/darcs.py
@@ -23,7 +23,8 @@
 
 import os
 import errno
-import _vc
+from . import _vc
+
 
 class Vc(_vc.CachedVc):
 
diff --git a/meld/vc/fossil.py b/meld/vc/fossil.py
index a3ec112..fd2c6ed 100644
--- a/meld/vc/fossil.py
+++ b/meld/vc/fossil.py
@@ -23,9 +23,10 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
-import _vc
 import errno
+import os
+
+from . import _vc
 
 
 class Vc(_vc.CachedVc):
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 46327ab..7ba3412 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -28,10 +28,12 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import errno
 import os
 import re
-import errno
-import _vc
+
+from . import _vc
+
 
 class Vc(_vc.CachedVc):
 
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index 0be1ea2..7c012ec 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -21,9 +21,10 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
 import errno
-import _vc
+import os
+
+from . import _vc
 
 
 class Vc(_vc.CachedVc):
diff --git a/meld/vc/monotone.py b/meld/vc/monotone.py
index eacf94e..804d525 100644
--- a/meld/vc/monotone.py
+++ b/meld/vc/monotone.py
@@ -22,9 +22,11 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
-import _vc
 import errno
+import os
+
+from . import _vc
+
 
 class Vc(_vc.CachedVc):
     NAME = "Monotone"
diff --git a/meld/vc/rcs.py b/meld/vc/rcs.py
index 71a0802..8193ad4 100644
--- a/meld/vc/rcs.py
+++ b/meld/vc/rcs.py
@@ -23,7 +23,9 @@
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
-import _vc
+
+from . import _vc
+
 
 class Vc(_vc.Vc):
     CMD = "rcs"
diff --git a/meld/vc/svk.py b/meld/vc/svk.py
index 8112b6b..4bb304f 100644
--- a/meld/vc/svk.py
+++ b/meld/vc/svk.py
@@ -22,7 +22,8 @@
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from meld import misc
-import svn
+from . import svn
+
 
 class Vc(svn.Vc):
 
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index df47ea3..d565eca 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -21,12 +21,13 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import errno
 import os
 import re
-import errno
-import _vc
 import xml.etree.ElementTree as ElementTree
 
+from . import _vc
+
 
 class Vc(_vc.CachedVc):
 
diff --git a/meld/vc/svn_17.py b/meld/vc/svn_17.py
index d8009f2..3feb4da 100644
--- a/meld/vc/svn_17.py
+++ b/meld/vc/svn_17.py
@@ -21,7 +21,7 @@
 ### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import svn
+from . import svn
 
 
 class Vc(svn.Vc):
diff --git a/meld/vc/tla.py b/meld/vc/tla.py
index 5cfe168..62e175f 100644
--- a/meld/vc/tla.py
+++ b/meld/vc/tla.py
@@ -21,9 +21,11 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #SOFTWARE.
 
-import os
 import errno
-import _vc
+import os
+
+from . import _vc
+
 
 # From the Arch manual (kept here for reference)
 
diff --git a/meld/vcview.py b/meld/vcview.py
index ea649e5..98f2e1f 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -24,13 +24,13 @@ from gettext import gettext as _
 import gtk
 import pango
 
-import tree
-import misc
-from ui import gnomeglade
-import melddoc
-import paths
-import ui.emblemcellrenderer
-import vc
+from . import melddoc
+from . import misc
+from . import paths
+from . import tree
+from . import vc
+from .ui import emblemcellrenderer
+from .ui import gnomeglade
 
 ################################################################################
 #
@@ -163,7 +163,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         self.treeview.set_search_equal_func(self.treeview_search_cb)
         self.current_path, self.prev_path, self.next_path = None, None, None
         column = gtk.TreeViewColumn( _("Name") )
-        renicon = ui.emblemcellrenderer.EmblemCellRenderer()
+        renicon = emblemcellrenderer.EmblemCellRenderer()
         rentext = gtk.CellRendererText()
         column.pack_start(renicon, expand=0)
         column.pack_start(rentext, expand=1)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]