From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 29 Sep 2010 16:19:50 +0000 (+0000)
Subject: Fix NNTP when there's a ".netrc" file
X-Git-Tag: v3.2a3~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5785b1524074656f0a0ec64e5e5cdb27aa3a356;p=thirdparty%2FPython%2Fcpython.git

Fix NNTP when there's a ".netrc" file
---

diff --git a/Lib/nntplib.py b/Lib/nntplib.py
index 1055d065108a..409342c78cd9 100644
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -279,11 +279,12 @@ class _NNTPBase:
     encoding = 'utf-8'
     errors = 'surrogateescape'
 
-    def __init__(self, file, user=None, password=None,
+    def __init__(self, file, host, user=None, password=None,
                  readermode=None, usenetrc=True,
                  timeout=_GLOBAL_DEFAULT_TIMEOUT):
         """Initialize an instance.  Arguments:
         - file: file-like object (open for read/write in binary mode)
+        - host: hostname of the server (used if `usenetrc` is True)
         - user: username to authenticate with
         - password: password to use with username
         - readermode: if true, send 'mode reader' command after
@@ -933,7 +934,7 @@ class NNTP(_NNTPBase):
         self.port = port
         self.sock = socket.create_connection((host, port), timeout)
         file = self.sock.makefile("rwb")
-        _NNTPBase.__init__(self, file, user, password,
+        _NNTPBase.__init__(self, file, host, user, password,
                            readermode, usenetrc, timeout)
 
     def _close(self):
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 85334bbefc36..dd100ef62c5a 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -12,6 +12,7 @@ TIMEOUT = 30
 # TODO:
 # - test the `file` arg to more commands
 # - test error conditions
+# - test auth and `usenetrc`
 
 
 class NetworkedNNTPTestsMixin:
@@ -255,7 +256,7 @@ class MockedNNTPTestsMixin:
         # isn't seekable.
         file = io.BufferedRWPair(self.sio, self.sio)
         kwargs.setdefault('usenetrc', False)
-        self.server = nntplib._NNTPBase(file, *args, **kwargs)
+        self.server = nntplib._NNTPBase(file, 'test.server', *args, **kwargs)
         return self.server