Changeset 840:09c54f758f74

Timestamp:

2010-02-10 21:57:27 (6 months ago)

Author:

Stefan Schwarzer <sschwarzer@…>

Branch:

default

Message:

Removed `xreadlines` stuff as announced in
http://codespeak.net/pipermail/ftputil/2009q1/000256.html .

Files:

• _test_ftp_file.py (modified) (2 diffs)
• ftp_file.py (modified) (4 diffs)

_test_ftp_file.py

@@ -1 @@
-# Copyright (C) 2002-2008, Stefan Schwarzer
+# Copyright (C) 2002-2010, Stefan Schwarzer
 # All rights reserved.
 #
@@ -216 +216 @@
         input_.close()
 
-    def test_ascii_xreadlines(self):
-        """Read ASCII text with `xreadlines`."""
-        host = _test_base.ftp_host_factory(session_factory=ReadMockSession)
-        # open file, skip some bytes
-        input_ = host.file('dummy', 'r')
-        data = input_.read(3)
-        xrl_obj = input_.xreadlines()
-        self.failUnless(xrl_obj.__class__ is ftp_file._XReadlines)
-        self.failUnless(xrl_obj._ftp_file.__class__ is ftp_file._FTPFile)
-        data = xrl_obj[0]
-        self.assertEqual(data, 'e 1\n')
-        # try to skip an index
-        self.assertRaises(RuntimeError, operator.__getitem__, xrl_obj, 2)
-        # continue reading
-        data = xrl_obj[1]
-        self.assertEqual(data, 'another line\n')
-        data = xrl_obj[2]
-        self.assertEqual(data, 'yet another line')
-        # try to read beyond EOF
-        self.assertRaises(IndexError, operator.__getitem__, xrl_obj, 3)
-
     def test_binary_iterator(self):
         """Test the iterator interface of `FTPFile` objects."""

ftp_file.py

@@ -1 @@
-# Copyright (C) 2003-2008, Stefan Schwarzer <sschwarzer@sschwarzer.net>
+# Copyright (C) 2003-2010, Stefan Schwarzer <sschwarzer@sschwarzer.net>
 # All rights reserved.
 #
@@ -36 +36 @@
 # $Id$
 
-import warnings
-
 import ftp_error
 
@@ -64 +62 @@
     """
     return text.replace('\n', '\r\n')
-
-
-# helper class for xreadline protocol for ASCII transfers
-#XXX maybe we can use the `xreadlines` module instead of this?
-class _XReadlines(object):
-    """Represents `xreadline` objects for ASCII transfers."""
-
-    def __init__(self, ftp_file):
-        self._ftp_file = ftp_file
-        self._next_index = 0
-
-    def __getitem__(self, index):
-        """Return next line with specified index."""
-        if index != self._next_index:
-            raise RuntimeError( "_XReadline access index "
-                  "out of order (expected %s but got %s)" %
-                  (self._next_index, index) )
-        line = self._ftp_file.readline()
-        if not line:
-            raise IndexError("_XReadline object out of data")
-        self._next_index += 1
-        return line
 
 
@@ -197 +173 @@
         return lines
 
-    def xreadlines(self):
-        """
-        Return an appropriate `xreadlines` object with built-in line
-        separator conversion support.
-        """
-        warnings.warn(("FTPFile.xreadlines is deprecated and will be removed "
-          "in ftputil 2.5"), DeprecationWarning, stacklevel=2)
-        if self._bin_mode:
-            return self._fo.xreadlines()
-        return _XReadlines(self)
-
     def __iter__(self):
         """Return a file iterator."""