diff options
| author | R. Tyler Ballance <tyler@monkeypox.org> | 2009-11-15 17:20:23 -0800 |
|---|---|---|
| committer | R. Tyler Ballance <tyler@monkeypox.org> | 2009-11-16 00:04:10 -0800 |
| commit | 47fbe57de8fc7fab20fd2d6b381ffbae411b74bc (patch) | |
| tree | f58b3097f2ccb9f5b99fe857abeef3861e7f34b7 /cheetah/SourceReader.py | |
| parent | 74961058e939739e97f9c570d5fc8c0959760dc9 (diff) | |
| download | python-cheetah-47fbe57de8fc7fab20fd2d6b381ffbae411b74bc.tar.gz | |
Clean up a swath of fixes suggested by 2to3
Fixes from 2to3 include: xrange, ws_comma, repr, reduce,
raise, idioms, has_key, future, filter, exec, callable, apply
Diffstat (limited to 'cheetah/SourceReader.py')
| -rw-r--r-- | cheetah/SourceReader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cheetah/SourceReader.py b/cheetah/SourceReader.py index 0dc0e60..a1537f6 100644 --- a/cheetah/SourceReader.py +++ b/cheetah/SourceReader.py @@ -160,7 +160,7 @@ class SourceReader: self._posTobookmarkMap[self._pos] = name def hasBookmark(self, name): - return self._bookmarks.has_key(name) + return name in self._bookmarks def gotoBookmark(self, name): if not self.hasBookmark(name): @@ -247,7 +247,7 @@ class SourceReader: if pos == None: pos = self._pos src = self.src() - return max(src.rfind('\n',0,pos)+1, src.rfind('\r',0,pos)+1, 0) + return max(src.rfind('\n', 0, pos)+1, src.rfind('\r', 0, pos)+1, 0) def findEOL(self, pos=None, gobble=False): if pos == None: |