[Pywikipedia-l] SVN: [6255] branches/rewrite/pywikibot/scripts/fixes.py

[russblau at svn.wikimedia.org]

Revision: 6255
Author:   russblau
Date:     2009-01-14 13:30:25 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------
merge recent changes from trunk

Modified Paths:
--------------
    branches/rewrite/pywikibot/scripts/fixes.py

Property Changed:
----------------
    branches/rewrite/pywikibot/scripts/fixes.py

Modified: branches/rewrite/pywikibot/scripts/fixes.py
===================================================================
--- branches/rewrite/pywikibot/scripts/fixes.py	2009-01-14 13:28:39 UTC (rev 6254)
+++ branches/rewrite/pywikibot/scripts/fixes.py	2009-01-14 13:30:25 UTC (rev 6255)
@@ -392,12 +392,16 @@
             # or spaces between digits and separators.
             # Note that these regular expressions also match valid ISBNs, but
             # these won't be changed.
-            (ur'ISBN (978|979) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN13
-            (ur'ISBN (\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN10
+            (r'ISBN (978|979) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13
+            (r'ISBN (\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d+) *[\- –\.] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10
+            # missing space before ISBN-10 or before ISBN-13,
+            # or non-breaking space.
+            (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'),
         ],
         'exceptions': {
             'inside-tags': [
                 'comment',
+                'hyperlink',
             ],
             'inside': [
                 r'ISBN (\d(-?)){12}\d',    # matches valid ISBN-13s


Property changes on: branches/rewrite/pywikibot/scripts/fixes.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/fixes.py:6187-6197
   + /trunk/pywikipedia/fixes.py:6187-6197,6199-6254