diff options
| author | Guido van Rossum <guido@python.org> | 1997-10-22 21:00:49 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-10-22 21:00:49 (GMT) |
| commit | 9694fcab5332f27dc28b195ba1391e5491d2eaef (patch) | |
| tree | 23dc3d9a7d1cc4b138ac2bffd028a519cba93b30 /Lib/plat-irix6/cddb.py | |
| parent | 426916e50e1209d8ecc12678855dc531863a48c5 (diff) | |
| download | cpython-9694fcab5332f27dc28b195ba1391e5491d2eaef.zip cpython-9694fcab5332f27dc28b195ba1391e5491d2eaef.tar.gz cpython-9694fcab5332f27dc28b195ba1391e5491d2eaef.tar.bz2 | |
Convert all remaining *simple* cases of regex usage to re usage.
Diffstat (limited to 'Lib/plat-irix6/cddb.py')
| -rw-r--r-- | Lib/plat-irix6/cddb.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Lib/plat-irix6/cddb.py b/Lib/plat-irix6/cddb.py index 57cf3c6..acd7870 100644 --- a/Lib/plat-irix6/cddb.py +++ b/Lib/plat-irix6/cddb.py @@ -81,18 +81,17 @@ class Cddb: self.notes = [] if not hasattr(self, 'file'): return - import regex - reg = regex.compile('^\\([^.]*\\)\\.\\([^:]*\\):[\t ]+\\(.*\\)') + import re + reg = re.compile(r'^([^.]*)\.([^:]*):[\t ]+(.*)') while 1: line = f.readline() if not line: break - if reg.match(line) == -1: + match = reg.match(line) + if not match: print 'syntax error in ' + file continue - name1 = line[reg.regs[1][0]:reg.regs[1][1]] - name2 = line[reg.regs[2][0]:reg.regs[2][1]] - value = line[reg.regs[3][0]:reg.regs[3][1]] + name1, name2, value = match.group(1, 2, 3) if name1 == 'album': if name2 == 'artist': self.artist = value |