From 46df95cf55fc1d9b9bb2513d47e3e1c9aa401b21 Mon Sep 17 00:00:00 2001
From: "R. Tyler Ballance" <tyler@monkeypox.org>
Date: Sun, 3 Jan 2010 14:08:33 -0800
Subject: Handle Python3's `slice` objects in SourceReader

---
 cheetah/SourceReader.py | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/cheetah/SourceReader.py b/cheetah/SourceReader.py
index 7a08837..0a44ed0 100644
--- a/cheetah/SourceReader.py
+++ b/cheetah/SourceReader.py
@@ -12,34 +12,8 @@ class Error(Exception):
                                 
 class SourceReader(object):
     def __init__(self, src, filename=None, breakPoint=None, encoding=None):
-
-        ## @@TR 2005-01-17: the following comes from a patch Terrel Shumway
-        ## contributed to add unicode support to the reading of Cheetah source
-        ## files with dynamically compiled templates. All the existing unit
-        ## tests pass but, it needs more testing and some test cases of its
-        ## own. My instinct is to move this up into the code that passes in the
-        ## src string rather than leaving it here.  As implemented here it
-        ## forces all src strings to unicode, which IMO is not what we want.
-        #  if encoding is None:
-        #      # peek at the encoding in the first two lines
-        #      m = EOLZre.search(src)
-        #      pos = m.end()
-        #      if pos<len(src):
-        #          m = EOLZre.search(src,pos)
-        #          pos = m.end()
-        #      m = ENCODINGsearch(src,0,pos)
-        #      if m:
-        #          encoding = m.group(1)
-        #      else:
-        #          encoding  = sys.getfilesystemencoding()
-        #  self._encoding = encoding
-        #  if type(src) is not unicode:
-        #      src = src.decode(encoding)
-        ## end of Terrel's patch
-
         self._src = src
         self._filename = filename
-
         self._srcLen = len(src)
         if breakPoint == None:
             self._breakPoint = self._srcLen
@@ -72,7 +46,10 @@ class SourceReader(object):
         return self._breakPoint
     
     def __getitem__(self, i):
-        self.checkPos(i)
+        if not isinstance(i, int):
+            self.checkPos(i.stop)
+        else:
+            self.checkPos(i)
         return self._src[i]
     
     def __getslice__(self, i, j):
@@ -80,7 +57,7 @@ class SourceReader(object):
         return self._src[i:j]
 
     def splitlines(self):
-        if not hasattr(self, '_srcLines'):                
+        if not hasattr(self, '_srcLines'):
             self._srcLines = self._src.splitlines()
         return self._srcLines
 
-- 
cgit v1.2.1