diff options
| author | Xiang Zhang <angwerzx@126.com> | 2016-12-27 12:30:42 +0800 |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2016-12-27 12:30:42 +0800 |
| commit | 7f36c4940810c3afd6bd9f0e6e890d4789299abd (patch) | |
| tree | 68aefb2b7ac66be96c1a54dddeda17e2c71a3932 /Lib/difflib.py | |
| parent | 7a548444dfb1b80a1442a7cb4c17818dd49d18ac (diff) | |
| parent | 4de2d1ba0aab6070885e47b7a9724d2623ba6cc6 (diff) | |
| download | cpython-7f36c4940810c3afd6bd9f0e6e890d4789299abd.tar.gz | |
Issue #29078: Merge 3.5.
Diffstat (limited to 'Lib/difflib.py')
| -rw-r--r-- | Lib/difflib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py index 076bbac01d..2095a5e517 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1415,7 +1415,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, import re # regular expression for finding intraline change indices - change_re = re.compile('(\++|\-+|\^+)') + change_re = re.compile(r'(\++|\-+|\^+)') # create the difference iterator to generate the differences diff_lines_iterator = ndiff(fromlines,tolines,linejunk,charjunk) |