File rednotebook-locale-unicode-fix.patch of Package rednotebook

Overview Repositories Revisions Requests Users Attributes Meta

File rednotebook-locale-unicode-fix.patch of Package rednotebook (Revision f267ea66fec631367a58138ea82a333c)

Currently displaying revision f267ea66fec631367a58138ea82a333c , Show latest

From ae67507e47279012becf668df198bf47df8dc70b Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Tue, 23 May 2017 08:53:58 +0200
Subject: [PATCH] don't use re.LOCALE for unicode string matching

---
 rednotebook/external/txt2tags.py | 4 ++--
 rednotebook/util/markup.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rednotebook/external/txt2tags.py b/rednotebook/external/txt2tags.py
index 37f5369b..8564bd65 100644
--- a/rednotebook/external/txt2tags.py
+++ b/rednotebook/external/txt2tags.py
@@ -1969,10 +1969,10 @@ def getRegexes():
     bank['linkmark'] = re.compile(
         r'\[(?P<label>%s|[^]]+) (?P<link>%s|%s|%s)\]'%(
             patt_img, retxt_url, patt_email, retxt_url_local),
-        re.L+re.I)
+        re.I)
 
     # Image
-    bank['img'] = re.compile(patt_img, re.L+re.I)
+    bank['img'] = re.compile(patt_img, re.I)
 
     # Special things
     bank['special'] = re.compile(r'^%!\s*')
diff --git a/rednotebook/util/markup.py b/rednotebook/util/markup.py
index 3362f626..2067d77e 100644
--- a/rednotebook/util/markup.py
+++ b/rednotebook/util/markup.py
@@ -41,7 +41,7 @@
 
 # named local link [my file.txt ""file:///home/user/my file.txt""]
 # named link in web [heise ""http://heise.de""]
-REGEX_NAMED_LINK = re.compile(r'(\[)(.*?)(\s"")(\S.*?\S)(""\])', flags=re.I | re.L)
+REGEX_NAMED_LINK = re.compile(r'(\[)(.*?)(\s"")(\S.*?\S)(""\])', flags=re.I)
 
 ESCAPE_COLOR = r'XBEGINCOLORX\1XSEPARATORX\2XENDCOLORX'
 COLOR_ESCAPED = r'XBEGINCOLORX(.*?)XSEPARATORX(.*?)XENDCOLORX'

From 8c32272c779fc7465247cf62902703afe39d4158 Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Tue, 23 May 2017 17:55:28 +0200
Subject: [PATCH] remove remaining uses of re.L and re.U

---
 rednotebook/data.py              | 2 +-
 rednotebook/external/txt2tags.py | 2 +-
 rednotebook/gui/t2t_highlight.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rednotebook/data.py b/rednotebook/data.py
index 49d8551a..42fa7c09 100644
--- a/rednotebook/data.py
+++ b/rednotebook/data.py
@@ -31,7 +31,7 @@
 HASHTAG_PATTERN = (
     r'(^|[^%(ALPHA_NUMERIC)s&#])(#|\uFF03)(?!%(HASHTAG_EXCLUDES)s)'
     '(%(HASHTAG_TEXT)s)' % locals())
-HASHTAG = re.compile(HASHTAG_PATTERN, flags=re.I | re.U)
+HASHTAG = re.compile(HASHTAG_PATTERN, flags=re.I)
 
 
 def escape_tag(tag):
diff --git a/rednotebook/external/txt2tags.py b/rednotebook/external/txt2tags.py
index 8564bd65..38482a7b 100644
--- a/rednotebook/external/txt2tags.py
+++ b/rednotebook/external/txt2tags.py
@@ -4367,7 +4367,7 @@ def compile_filters(filters, errmsg='Filter'):
         for i in range(len(filters)):
             patt,repl = filters[i]
             ## JS: Make filters Unicode-aware.
-            try: rgx = re.compile(patt, re.U)
+            try: rgx = re.compile(patt)
             except: Error("%s: '%s'"%(errmsg, patt))
             filters[i] = (rgx,repl)
     return filters
diff --git a/rednotebook/gui/t2t_highlight.py b/rednotebook/gui/t2t_highlight.py
index bdb173c7..b126c83f 100644
--- a/rednotebook/gui/t2t_highlight.py
+++ b/rednotebook/gui/t2t_highlight.py
@@ -65,11 +65,11 @@ def __init__(self, pattern_or_regex, group_tag_pairs, flags="",
         if isinstance(pattern_or_regex, str):
             # assemble re-flag
             # TODO: Is this needed?
-            flags += "ML"
+            flags += "M"
             flag = 0
 
             for char in flags:
-                assert char in 'MLSIUX'
+                assert char in 'MSIUX'
                 flag |= getattr(re, char)
 
             self._regexp = re.compile(pattern_or_regex, flag)

Places

File rednotebook-locale-unicode-fix.patch of Package rednotebook (Revision f267ea66fec631367a58138ea82a333c)

Places