[meld] recent: Clean up imports
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] recent: Clean up imports
- Date: Mon, 14 Oct 2013 21:10:36 +0000 (UTC)
commit 3ccfa034942262f3e096740e9516032e241782c4
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon Oct 7 13:44:14 2013 +1000
recent: Clean up imports
meld/recent.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/recent.py b/meld/recent.py
index d1365e0..e20fac1 100644
--- a/meld/recent.py
+++ b/meld/recent.py
@@ -33,10 +33,10 @@ import tempfile
from gettext import gettext as _
from gi.repository import Gio
-import glib
+from gi.repository import GLib
from gi.repository import Gtk
-from . import misc
+import meld.misc
TYPE_FILE = "File"
@@ -48,7 +48,7 @@ COMPARISON_TYPES = (TYPE_FILE, TYPE_FOLDER, TYPE_VC, TYPE_MERGE)
class RecentFiles(object):
- recent_path = os.path.join(glib.get_user_data_dir(), "meld")
+ recent_path = os.path.join(GLib.get_user_data_dir(), "meld")
recent_suffix = ".meldcmp"
# Recent data
@@ -94,7 +94,7 @@ class RecentFiles(object):
gio_file = Gio.File.new_for_path(recent_path)
if len(paths) > 1:
- display_name = " : ".join(misc.shorten_names(*paths))
+ display_name = " : ".join(meld.misc.shorten_names(*paths))
else:
display_path = paths[0]
userhome = os.path.expanduser("~")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]