Merge branch 'master' into 471-int

1 files changed, 22 insertions, 22 deletions

diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py
index e899108d..bfe7b7c7 100644
--- a/paramiko/sftp_si.py
+++ b/paramiko/sftp_si.py
@@ -35,16 +35,15 @@ class SFTPServerInterface (object):
     SFTP sessions).  However, raising an exception will usually cause the SFTP
     session to abruptly end, so you will usually want to catch exceptions and
     return an appropriate error code.
-    
+
     All paths are in string form instead of unicode because not all SFTP
     clients & servers obey the requirement that paths be encoded in UTF-8.
     """
-    
     def __init__(self, server, *largs, **kwargs):
         """
         Create a new SFTPServerInterface object.  This method does nothing by
         default and is meant to be overridden by subclasses.
-        
+
         :param .ServerInterface server:
             the server object associated with this channel and SFTP subsystem
         """
@@ -73,7 +72,7 @@ class SFTPServerInterface (object):
         on that file.  On success, a new object subclassed from `.SFTPHandle`
         should be returned.  This handle will be used for future operations
         on the file (read, write, etc).  On failure, an error code such as
-        `.SFTP_PERMISSION_DENIED` should be returned.
+        ``SFTP_PERMISSION_DENIED`` should be returned.
 
         ``flags`` contains the requested mode for opening (read-only,
         write-append, etc) as a bitset of flags from the ``os`` module:
@@ -92,7 +91,7 @@ class SFTPServerInterface (object):
         The ``attr`` object contains requested attributes of the file if it
         has to be created.  Some or all attribute fields may be missing if
         the client didn't specify them.
-        
+
         .. note:: The SFTP protocol defines all files to be in "binary" mode.
             There is no equivalent to Python's "text" mode.
 
@@ -121,13 +120,14 @@ class SFTPServerInterface (object):
         `.SFTPAttributes.from_stat` will usually do what you want.
 
         In case of an error, you should return one of the ``SFTP_*`` error
-        codes, such as `.SFTP_PERMISSION_DENIED`.
+        codes, such as ``SFTP_PERMISSION_DENIED``.
 
-        :param str path: the requested path (relative or absolute) to be listed.
+        :param str path: the requested path (relative or absolute) to be
+            listed.
         :return:
             a list of the files in the given folder, using `.SFTPAttributes`
             objects.
-        
+
         .. note::
             You should normalize the given ``path`` first (see the `os.path`
             module) and check appropriate permissions before returning the list
@@ -150,7 +150,7 @@ class SFTPServerInterface (object):
             for.
         :return:
             an `.SFTPAttributes` object for the given file, or an SFTP error
-            code (like `.SFTP_PERMISSION_DENIED`).
+            code (like ``SFTP_PERMISSION_DENIED``).
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -168,7 +168,7 @@ class SFTPServerInterface (object):
         :type path: str
         :return:
             an `.SFTPAttributes` object for the given file, or an SFTP error
-            code (like `.SFTP_PERMISSION_DENIED`).
+            code (like ``SFTP_PERMISSION_DENIED``).
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -178,7 +178,7 @@ class SFTPServerInterface (object):
 
         :param str path:
             the requested path (relative or absolute) of the file to delete.
-        :return: an SFTP error code `int` like `.SFTP_OK`.
+        :return: an SFTP error code `int` like ``SFTP_OK``.
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -189,7 +189,7 @@ class SFTPServerInterface (object):
         and since there's no other (easy) way to move files via SFTP, it's
         probably a good idea to implement "move" in this method too, even for
         files that cross disk partition boundaries, if at all possible.
-        
+
         .. note:: You should return an error if a file with the same name as
             ``newpath`` already exists.  (The rename operation should be
             non-desctructive.)
@@ -197,7 +197,7 @@ class SFTPServerInterface (object):
         :param str oldpath:
             the requested path (relative or absolute) of the existing file.
         :param str newpath: the requested new path of the file.
-        :return: an SFTP error code `int` like `.SFTP_OK`.
+        :return: an SFTP error code `int` like ``SFTP_OK``.
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -220,13 +220,13 @@ class SFTPServerInterface (object):
 
         The ``attr`` object will contain only those fields provided by the
         client in its request, so you should use ``hasattr`` to check for
-        the presense of fields before using them.  In some cases, the ``attr``
+        the presence of fields before using them.  In some cases, the ``attr``
         object may be completely empty.
 
         :param str path:
             requested path (relative or absolute) of the new folder.
         :param .SFTPAttributes attr: requested attributes of the new folder.
-        :return: an SFTP error code `int` like `.SFTP_OK`.
+        :return: an SFTP error code `int` like ``SFTP_OK``.
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -238,7 +238,7 @@ class SFTPServerInterface (object):
 
         :param str path:
             requested path (relative or absolute) of the folder to remove.
-        :return: an SFTP error code `int` like `.SFTP_OK`.
+        :return: an SFTP error code `int` like ``SFTP_OK``.
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -253,7 +253,7 @@ class SFTPServerInterface (object):
         :param attr:
             requested attributes to change on the file (an `.SFTPAttributes`
             object)
-        :return: an error code `int` like `.SFTP_OK`.
+        :return: an error code `int` like ``SFTP_OK``.
         """
         return SFTP_OP_UNSUPPORTED
 
@@ -279,25 +279,25 @@ class SFTPServerInterface (object):
             # on windows, normalize backslashes to sftp/posix format
             out = out.replace('\\', '/')
         return out
-    
+
     def readlink(self, path):
         """
         Return the target of a symbolic link (or shortcut) on the server.
         If the specified path doesn't refer to a symbolic link, an error
         should be returned.
-        
+
         :param str path: path (relative or absolute) of the symbolic link.
         :return:
             the target `str` path of the symbolic link, or an error code like
-            `.SFTP_NO_SUCH_FILE`.
+            ``SFTP_NO_SUCH_FILE``.
         """
         return SFTP_OP_UNSUPPORTED
-    
+
     def symlink(self, target_path, path):
         """
         Create a symbolic link on the server, as new pathname ``path``,
         with ``target_path`` as the target of the link.
-        
+
         :param str target_path:
             path (relative or absolute) of the target for this new symbolic
             link.