traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch by Charles G. Waldman to add optional user and password 

arguments to NNTP.__init__(), for nntp servers that need them.
This commit is contained in:
Guido van Rossum 1997-10-20 23:29:44 +00:00
parent 4a2a621907
commit dd65975ac7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/nntplib.py
View File

@ -63,7 +63,7 @@ class NNTP:
# - host: hostname to connect to # - host: hostname to connect to
# - port: port to connect to (default the standard NNTP port) # - port: port to connect to (default the standard NNTP port)
def __init__(self, host, port = NNTP_PORT): def __init__(self, host, port = NNTP_PORT, user=None, password=None):
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -71,6 +71,15 @@ class NNTP:
self.file = self.sock.makefile('rb') self.file = self.sock.makefile('rb')
self.debugging = 0 self.debugging = 0
self.welcome = self.getresp() self.welcome = self.getresp()
if user:
resp = self.shortcmd('authinfo user '+user)
if resp[:3] == '381':
if not password:
raise error_reply, resp
else:
resp = self.shortcmd('authinfo pass '+password)
if resp[:3] != '281':
raise error_perm, resp
# Get the welcome message from the server # Get the welcome message from the server
# (this is read and squirreled away by __init__()). # (this is read and squirreled away by __init__()).