diff -r 0a02c433f52d -r 5883ce99ee12 QScintilla/SearchReplaceWidget.py
--- a/QScintilla/SearchReplaceWidget.py Fri Nov 01 15:48:48 2013 +0100
+++ b/QScintilla/SearchReplaceWidget.py Sun Nov 03 15:58:22 2013 +0100
@@ -118,7 +118,7 @@
<td>This matches 1 or more times. For example, <code>Sa+m</code> matches
<code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td></tr>
</table>
-""")
+""") # __IGNORE_WARNING__
self.setWhatsThis(whatsThis)
self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
@@ -426,16 +426,16 @@
else:
ok = False
elif (lineFrom == boundary[0] and indexFrom >= boundary[1]) or \
- (lineFrom > boundary[0] and lineFrom < boundary[2]) or \
- (lineFrom == boundary[2] and indexFrom <= boundary[3]):
+ (lineFrom > boundary[0] and lineFrom < boundary[2]) or \
+ (lineFrom == boundary[2] and indexFrom <= boundary[3]):
ok = True
else:
ok = False
if not ok and len(self.__selections) > 1:
# try again
while not ok and \
- ((backwards and lineFrom >= boundary[0]) or \
- (not backwards and lineFrom <= boundary[2])):
+ ((backwards and lineFrom >= boundary[0]) or
+ (not backwards and lineFrom <= boundary[2])):
for ind in range(len(self.__selections)):
if lineFrom == self.__selections[ind][0]:
after = indexTo > self.__selections[ind][3]
@@ -502,11 +502,11 @@
break
else:
ok = False
- elif (lineFrom == boundary[0] and \
+ elif (lineFrom == boundary[0] and
indexFrom >= boundary[1]) or \
- (lineFrom > boundary[0] and \
+ (lineFrom > boundary[0] and
lineFrom < boundary[2]) or \
- (lineFrom == boundary[2] \
+ (lineFrom == boundary[2]
and indexFrom <= boundary[3]):
ok = True
else:
@@ -697,8 +697,8 @@
else:
ok = False
elif (lineFrom == boundary[0] and indexFrom >= boundary[1]) or \
- (lineFrom > boundary[0] and lineFrom < boundary[2]) or \
- (lineFrom == boundary[2] and indexFrom <= boundary[3]):
+ (lineFrom > boundary[0] and lineFrom < boundary[2]) or \
+ (lineFrom == boundary[2] and indexFrom <= boundary[3]):
ok = True
else:
ok = False
@@ -760,12 +760,12 @@
E5MessageBox.information(
self, self.windowTitle(),
self.trUtf8("Replaced {0} occurrences.")
- .format(replacements))
+ .format(replacements))
else:
E5MessageBox.information(
self, self.windowTitle(),
self.trUtf8("Nothing replaced because '{0}' was not found.")
- .format(ftxt))
+ .format(ftxt))
aw.setCursorPosition(cline, cindex)
aw.ensureCursorVisible()
