[meld] Clean up tree module imports
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Clean up tree module imports
- Date: Wed, 25 Jan 2012 23:26:35 +0000 (UTC)
commit 06705568462f299f47bf55f28396e40030f18c5f
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Jan 26 09:24:44 2012 +1000
Clean up tree module imports
meld/tree.py | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/meld/tree.py b/meld/tree.py
index a268047..df29187 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -17,12 +17,11 @@
import os
import gobject
import gtk
-from ui import gnomeglade
-import paths
COL_PATH, COL_STATE, COL_TEXT, COL_ICON, COL_TINT, COL_END = range(6)
-from vc._vc import STATE_IGNORED, STATE_NONE, STATE_NORMAL, STATE_NOCHANGE, \
+from meld.vc._vc import \
+ STATE_IGNORED, STATE_NONE, STATE_NORMAL, STATE_NOCHANGE, \
STATE_ERROR, STATE_EMPTY, STATE_NEW, \
STATE_MODIFIED, STATE_CONFLICT, STATE_REMOVED, \
STATE_MISSING, STATE_MAX
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]