We are currently indexing your data, so search results may be incomplete until we finish.
hggtk: more pychecker warnings
(buffer) shadows builtin
(file) shadows builtin
(iter) shadows builtin
(id) shadows builtin
Module (sys) re-imported
Changeset 11460338b5c5…
Parent 39b1a7f2bb62…
by
Changes to 8 files · Browse files at 11460338b5c5 Showing diff from parent 39b1a7f2bb62 Diff from another changeset...
|
@@ -57,8 +57,8 @@ self.logview = gtk.TextView(buffer=None)
self.logview.set_editable(True)
self.logview.modify_font(pango.FontDescription("Monospace"))
- buffer = self.logview.get_buffer()
- buffer.set_text('Backed out changeset: ' + rev)
+ buf = self.logview.get_buffer()
+ buf.set_text('Backed out changeset: ' + rev)
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
@@ -81,8 +81,8 @@ rev = histselect.select(self.root)
if rev is not None:
self.reventry.set_text(rev)
- buffer = self.logview.get_buffer()
- buffer.set_text('Backed out changeset: ' + rev)
+ buf = self.logview.get_buffer()
+ buf.set_text('Backed out changeset: ' + rev)
def _toolbutton(self, stock, label, handler, tip):
tbutton = gtk.ToolButton(stock)
@@ -92,10 +92,10 @@ return tbutton
def _backout_clicked(self, button):
- buffer = self.logview.get_buffer()
- start, end = buffer.get_bounds()
+ buf = self.logview.get_buffer()
+ start, end = buf.get_bounds()
cmdline = ['hg', 'backout', '--rev', self.reventry.get_text(),
- '--message', buffer.get_text(start, end)]
+ '--message', buf.get_text(start, end)]
dlg = CmdDialog(cmdline)
dlg.show_all()
dlg.run()
|
||
|
@@ -6,8 +6,6 @@
import os
import subprocess
-import sys
-import time
import pygtk
pygtk.require('2.0')
@@ -184,7 +182,7 @@ return False
try:
- status, file, txt = iterator.next()
+ status, wfile, txt = iterator.next()
except StopIteration:
self.stbar.end()
return False
@@ -192,7 +190,7 @@ lines = txt.splitlines()
eob = buf.get_end_iter()
offset = eob.get_offset()
- fileoffs, tags, lines, statmax = self.prepare_diff(lines, offset, file)
+ fileoffs, tags, lines, statmax = self.prepare_diff(lines, offset, wfile)
for l in lines:
buf.insert(eob, l)
@@ -208,7 +206,7 @@ pos = buf.get_iter_at_offset(offset)
mark = 'mark_%d' % offset
buf.create_mark(mark, pos)
- filelist.append((status, toutf(file), mark, True, stats))
+ filelist.append((status, toutf(wfile), mark, True, stats))
sob, eob = buf.get_bounds()
buf.apply_tag_by_name("mono", pos, eob)
return True
@@ -422,10 +420,10 @@ statmax = max( statmax, stats[0]+stats[1] )
return filespos, tags, outlines, statmax
- def link_event(self, tag, widget, event, iter):
+ def link_event(self, tag, widget, event, liter):
if event.type != gtk.gdk.BUTTON_RELEASE:
return
- text = self.get_link_text(tag, widget, iter)
+ text = self.get_link_text(tag, widget, liter)
if not text:
return
linkrev = long(text.split(':')[0])
@@ -435,13 +433,13 @@ else:
self.load_details(linkrev)
- def get_link_text(self, tag, widget, iter):
+ def get_link_text(self, tag, widget, liter):
"""handle clicking on a link in a textview"""
text_buffer = widget.get_buffer()
- beg = iter.copy()
+ beg = liter.copy()
while not beg.begins_tag(tag):
beg.backward_char()
- end = iter.copy()
+ end = liter.copy()
while not end.ends_tag(tag):
end.forward_char()
text = text_buffer.get_text(beg, end)
@@ -584,14 +582,14 @@ tag_table.add( link_tag )
def _filelist_rowchanged(self, sel):
- model, iter = sel.get_selected()
- if not iter:
+ model, path = sel.get_selected()
+ if not path:
return
# scroll to file in details window
- mark = self._buffer.get_mark(model[iter][2])
+ mark = self._buffer.get_mark(model[path][2])
self.textview.scroll_to_mark(mark, 0.0, True, 0.0, 0.0)
- if model[iter][3]:
- self.curfile = fromutf(model[iter][1])
+ if model[path][3]:
+ self.curfile = fromutf(model[path][1])
else:
self.curfile = None
@@ -634,9 +632,9 @@ return True
def _save_file_rev(self, menuitem):
- file = util.localpath(self.curfile)
- file, ext = os.path.splitext(os.path.basename(file))
- filename = "%s@%d%s" % (file, self.currev, ext)
+ wfile = util.localpath(self.curfile)
+ wfile, ext = os.path.splitext(os.path.basename(wfile))
+ filename = "%s@%d%s" % (wfile, self.currev, ext)
fd = NativeSaveFileDialogWrapper(Title = "Save file to",
InitialDir=self.cwd,
FileName=filename)
|
||
|
@@ -11,7 +11,6 @@ pass
import os
-import sys
import gtk
import pango
from dialog import question_dialog, error_dialog, info_dialog
|
||
|
@@ -45,14 +45,14 @@ self.opts['rev'] = ''
if self.test_opt('message'):
- buffer = gtk.TextBuffer()
- buffer.set_text(self.opts['message'])
- self.text.set_buffer(buffer)
+ buf = gtk.TextBuffer()
+ buf.set_text(self.opts['message'])
+ self.text.set_buffer(buf)
if self.test_opt('logfile'):
- buffer = gtk.TextBuffer()
- buffer.set_text('Comment will be read from file ' + self.opts['logfile'])
- self.text.set_buffer(buffer)
+ buf = gtk.TextBuffer()
+ buf.set_text('Comment will be read from file ' + self.opts['logfile'])
+ self.text.set_buffer(buf)
self.text.set_sensitive(False)
@@ -104,15 +104,15 @@ model = combobox.get_model()
index = combobox.get_active()
if index >= 0:
- buffer = self.text.get_buffer()
- begin, end = buffer.get_bounds()
- cur_msg = buffer.get_text(begin, end)
+ buf = self.text.get_buffer()
+ begin, end = buf.get_bounds()
+ cur_msg = buf.get_text(begin, end)
if len(cur_msg):
response = Confirm('Discard Message', [], self,
'Discard current commit message?').run()
if response != gtk.RESPONSE_YES:
return
- buffer.set_text(model[index][1])
+ buf.set_text(model[index][1])
def _update_recent_messages(self, msg=None):
if msg is not None:
@@ -197,10 +197,10 @@ # If there are more than a few character typed into the commit
# message, ask if the exit should continue.
live = False
- buffer = self.text.get_buffer()
- begin, end = buffer.get_bounds()
- cur_msg = buffer.get_text(begin, end)
- if buffer.get_char_count() > 10 and cur_msg != self.qheader:
+ buf = self.text.get_buffer()
+ begin, end = buf.get_bounds()
+ cur_msg = buf.get_text(begin, end)
+ if buf.get_char_count() > 10 and cur_msg != self.qheader:
dialog = Confirm('Exit', [], self, 'Save commit message at exit?')
res = dialog.run()
if res == gtk.RESPONSE_YES:
|
||
|
@@ -349,10 +349,10 @@ (path, focus) = treeview.get_cursor()
model = treeview.get_model()
if path is not None and model is not None:
- iter = model.get_iter(path)
- self.currev = model[iter][self.COL_REVID]
- self.curpath = fromutf(model[iter][self.COL_PATH])
- self.stbar.set_status_text(toutf(model[iter][self.COL_TOOLTIP]))
+ paths = model.get_iter(path)
+ self.currev = model[paths][self.COL_REVID]
+ self.curpath = fromutf(model[paths][self.COL_PATH])
+ self.stbar.set_status_text(toutf(model[paths][self.COL_TOOLTIP]))
def _stop_current_search(self, button, widget):
num = self.notebook.get_current_page()
|
||
|
@@ -114,15 +114,15 @@ self.refresh()
def pattree_rowchanged(self, sel, remove):
- model, iter = sel.get_selected()
- sensitive = iter and True or False
+ model, paths = sel.get_selected()
+ sensitive = paths and True or False
remove.set_sensitive(sensitive)
def unknown_rowchanged(self, sel):
- model, iter = sel.get_selected()
- if not iter:
+ model, paths = sel.get_selected()
+ if not paths:
return
- self.glob_entry.set_text(model[iter][0])
+ self.glob_entry.set_text(model[paths][0])
def add_glob(self, widget, glob_entry):
newglob = glob_entry.get_text()
|
||
|
@@ -83,19 +83,19 @@ self.treeview.expand_all()
def _cursor_changed(self, tv):
- (model, iter) = tv.get_selection().get_selected()
- path = self.model.get_path(iter)
- cs = self.history[path[0]]['changeset'][0]
- rev, id = cs.split(':')
- self.selected = (rev, id)
+ model, selpaths = tv.get_selection().get_selected_rows()
+ if not selpaths: return
+ cs = model[selpaths[0]][1]
+ rev, csid = cs.split(':')
+ self.selected = (rev, csid)
def get_revision(self, index):
import string
try:
cs = self.history[index]
revpair = cs['changeset'][0]
- revnum, id = revpair.split(':')
- return string.atoi(revnum), id
+ revnum, csid = revpair.split(':')
+ return string.atoi(revnum), csid
except:
return None
|
||
|
@@ -351,7 +351,6 @@ gtk.gdk.threads_leave()
if __name__ == "__main__":
- import sys
opts = {}
opts['cwd'] = os.getcwd()
if len(sys.argv) == 2 and sys.argv[1].endswith('.conf'):
|
||
Add a tag
Loading...