[MediaWiki-commits] [Gerrit] [bugfix] "D" is a valid roman number char - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263324

Change subject: [bugfix] "D" is a valid roman number char
......................................................................

[bugfix] "D" is a valid roman number char

Also synchronize with master branch:
- use ascii_letters from string
- reorder imports

Change-Id: Ifc9ce2b02318db679540158fb209e56126356fee
---
M scripts/casechecker.py
1 file changed, 15 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/24/263324/1

diff --git a/scripts/casechecker.py b/scripts/casechecker.py
index e7aff0a..b98780f 100755
--- a/scripts/casechecker.py
+++ b/scripts/casechecker.py
@@ -2,19 +2,23 @@
 # -*- coding: utf-8  -*-
 """Bot to find all pages on the wiki with mixed latin and cyrilic alphabets."""
 #
-# (C) Pywikibot team, 2006-2014
+# (C) Pywikibot team, 2006-2015
 #
 # Distributed under the terms of the MIT license.
 #
 from __future__ import print_function, unicode_literals
 __version__ = '$Id$'
 
-import os
-import sys
-import re
 import codecs
+import os
+import re
+from string import ascii_letters
+import sys
+
 import pywikibot
+
 from pywikibot import i18n
+
 from pywikibot.data import api
 from pywikibot.tools import first_lower, first_upper
 
@@ -102,7 +106,7 @@
     localKeyboard = u'йцукенгшщзфывапролдячсмить'
     latinKeyboard = u'qwertyuiopasdfghjklzxcvbnm'
 
-    romanNumChars = u'IVXLMC'
+    romanNumChars = u'IVXLCDM'
     # all letters that may be used as suffixes after roman numbers:  "Iый"
     romannumSuffixes = localLowerLtr
     romanNumSfxPtrn = re.compile(
@@ -111,8 +115,6 @@
     whitelists = {
         'ru': u'ВП:КЛ/Проверенные',
     }
-
-    latLtr = u'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
     lclClrFnt = u'<font color=green>'
     latClrFnt = u'<font color=brown>'
@@ -244,10 +246,11 @@
             self.latToLclKeybDict = {}
 
         badPtrnStr = u'([%s][%s]|[%s][%s])' \
-                     % (self.latLtr, self.localLtr, self.localLtr, self.latLtr)
+                     % (ascii_letters, self.localLtr,
+                        self.localLtr, ascii_letters)
         self.badWordPtrn = re.compile(u'[%s%s]*%s[%s%s]*'
-                                      % (self.latLtr, self.localLtr,
-                                         badPtrnStr, self.latLtr,
+                                      % (ascii_letters, self.localLtr,
+                                         badPtrnStr, ascii_letters,
                                          self.localLtr))
 
         # Get whitelist
@@ -535,7 +538,7 @@
                 else:
                     if mightBeLcl and l not in self.latinSuspects:
                         mightBeLcl = False
-                    if l not in self.latLtr:
+                    if l not in ascii_letters:
                         raise ValueError(u'Assert failed')
 
             # Some words are well known and frequently mixed-typed
@@ -699,7 +702,7 @@
                     else:
                         res += self.suffixClr + self.lclClrFnt
                     lastIsCyr = True
-            elif l in self.latLtr:
+            elif l in ascii_letters:
                 if lastIsCyr:
                     if toScreen:
                         SetColor(FOREGROUND_RED)

-- 
To view, visit https://gerrit.wikimedia.org/r/263324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9ce2b02318db679540158fb209e56126356fee
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: 2.0
Gerrit-Owner: Xqt <i...@gno.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits