Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant code

Browse Source
This commit is contained in:
Nick Hall 2015-11-28 18:49:22 +00:00
parent f11c7b9de0
commit 24377c66c8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/gui/widgets/undoableentry.py
View File

@ -48,17 +48,14 @@ from gi.repository import Gtk
# Gramps modules # Gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gramps.gen.constfunc import conv_to_unicode
from .undoablebuffer import Stack from .undoablebuffer import Stack
class UndoableInsertEntry(object): class UndoableInsertEntry(object):
"""something that has been inserted into our Gtk.editable""" """something that has been inserted into our Gtk.editable"""
def __init__(self, text, length, position, editable): def __init__(self, text, length, position, editable):
self.offset = position self.offset = position
self.text = str(text) self.text = text
#unicode char can have length > 1 as it points in the buffer #unicode char can have length > 1 as it points in the buffer
if not isinstance(text, str):
text = conv_to_unicode(text, 'utf-8')
charlength = len(text) charlength = len(text)
self.length = charlength self.length = charlength
if charlength > 1 or self.text in ("\r", "\n", " "): if charlength > 1 or self.text in ("\r", "\n", " "):
@ -284,8 +281,6 @@ class UndoableEntry(Gtk.Entry):
self.set_position(undo_action.offset) self.set_position(undo_action.offset)
def _undo_delete(self, undo_action): def _undo_delete(self, undo_action):
if not isinstance(undo_action.text, str):
undo_action.text = conv_to_unicode(undo_action.text, 'utf-8')
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter('ignore') warnings.simplefilter('ignore')
self.insert_text(undo_action.text, undo_action.start) self.insert_text(undo_action.text, undo_action.start)