Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9.1, 0.9.1.1, and 0.9.2

stable gtklib: fix circular dependency

Delay the import of gdialog until it is required. Fixes #710

Changeset 50af3738159b…

Parent 3b544da2b7a9…

by Steve Borho

Changes to one file · Browse files at 50af3738159b Showing diff from parent 3b544da2b7a9 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
 
16
17
18
19
 
20
21
22
 
242
243
244
 
245
246
247
 
16
17
18
 
19
20
21
22
 
242
243
244
245
246
247
248
@@ -16,7 +16,7 @@
 from tortoisehg.util.i18n import _  from tortoisehg.util import paths, hglib, thread2   -from tortoisehg.hgtk import hgtk, gdialog +from tortoisehg.hgtk import hgtk    if gtk.gtk_version < (2, 14, 0):   # at least on 2.12.12, gtk widgets can be confused by control @@ -242,6 +242,7 @@
  def overwriteConfirmation(self, filepath):   result = filepath   if os.path.exists(filepath): + from tortoisehg.hgtk import gdialog   res = gdialog.Confirm(_('Confirm Overwrite'), [], None,   _('The file "%s" already exists!\n\n'   'Do you want to overwrite it?') % filepath).run()