From a71eb88f68d5fe86f1a0699bead330eaf573a864 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Wed, 18 Nov 2009 20:26:54 -0800 Subject: [PATCH] controllers.compare: Fix clashing module and function name Signed-off-by: David Aguilar --- cola/controllers/compare.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cola/controllers/compare.py b/cola/controllers/compare.py index 728b1fb9..109f1046 100644 --- a/cola/controllers/compare.py +++ b/cola/controllers/compare.py @@ -12,7 +12,7 @@ from cola import gitcmds from cola.qobserver import QObserver from cola.models.compare import CompareModel from cola.models.compare import BranchCompareModel -from cola.views import compare +from cola.views import compare as vcompare from cola.controllers.repobrowser import select_file_from_repo def compare_file(): @@ -28,7 +28,7 @@ def compare(filename=None): """Launches a dialog for comparing a pair of commits""" parent = QtGui.QApplication.instance().activeWindow() model = CompareModel() - view = compare.CompareView(parent) + view = vcompare.CompareView(parent) ctl = CompareController(model, view, filename) view.show() @@ -36,7 +36,7 @@ def branch_compare(): """Launches a dialog for comparing a pair of branches""" model = BranchCompareModel() parent = QtGui.QApplication.instance().activeWindow() - view = compare.BranchCompareView(parent) + view = vcompare.BranchCompareView(parent) ctl = BranchCompareController(model, view) view.show() -- 2.11.4.GIT