jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/596481 )
Change subject: [bugfix] There are more splitlines boundaries than just "\n"
......................................................................
[bugfix] There are more splitlines boundaries than just "\n"
- test for all boundaries used by splitlines
- also remove Python 2 related code parts
Change-Id: I65b2a3df0f59c91ad3be38aefc816a5fca057dcf
---
M pywikibot/diff.py
1 file changed, 11 insertions(+), 25 deletions(-)
Approvals:
Zhuyifei1999: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/diff.py b/pywikibot/diff.py
index 1bc9a20..150e5c5 100644
--- a/pywikibot/diff.py
+++ b/pywikibot/diff.py
@@ -5,28 +5,19 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import absolute_import, division, unicode_literals
-
import difflib
import math
-try:
- from collections.abc import Sequence
-except ImportError: # Python 2.7
- from collections import Sequence
+from collections.abc import Sequence
from difflib import _format_range_unified as format_range_unified
+from itertools import zip_longest
import pywikibot
-from pywikibot.tools import chars, deprecated_args, PY2
+from pywikibot.tools import chars, deprecated_args
from pywikibot.tools.formatter import color_format
-if not PY2:
- from itertools import zip_longest
-else:
- from itertools import izip_longest as zip_longest
-
-class Hunk(object):
+class Hunk:
"""One change hunk between a and b.
@@ -154,16 +145,14 @@
fmt = fmt if fmt else None
yield self.color_line(line2, fmt)
- def color_line(self, line, line_ref=None):
+ def color_line(self, line: str, line_ref=None):
"""Color line characters.
If line_ref is None, the whole line is colored.
If line_ref[i] is not blank, line[i] is colored.
Color depends if line starts with +/-.
- line: string
line_ref: string.
-
"""
color = line[0]
@@ -246,7 +235,7 @@
hunk.reviewed = reviewed
-class PatchManager(object):
+class PatchManager:
"""Apply patches to text_a to obtain a new text.
@@ -254,14 +243,12 @@
"""
@deprecated_args(n='context')
- def __init__(self, text_a, text_b, context=0, by_letter=False,
- replace_invisible=False):
+ def __init__(self, text_a: str, text_b: str, context=0, by_letter=False,
+ replace_invisible=False) -> None:
"""Initializer.
@param text_a: base text
- @type text_a: basestring
@param text_b: target text
- @type text_b: basestring
@param context: number of lines which are context
@type context: int
@param by_letter: if text_a and text_b are single lines, comparison can
@@ -271,10 +258,9 @@
the charnumber in brackets (e.g. <200e>).
@type replace_invisible: bool
"""
- if '\n' in text_a or '\n' in text_b or not by_letter:
- self.a = text_a.splitlines(1)
- self.b = text_b.splitlines(1)
- else:
+ self.a = text_a.splitlines(True)
+ self.b = text_b.splitlines(True)
+ if by_letter and len(self.a) <= 1 and len(self.b) <= 1:
self.a = text_a
self.b = text_b
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/596481
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I65b2a3df0f59c91ad3be38aefc816a5fca057dcf
Gerrit-Change-Number: 596481
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Dvorapa <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: Zhuyifei1999 <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: D3r1ck01 <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
