1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

discard endrequest(); minor stuff; rfc822 no seek flag

Browse Source
This commit is contained in:
Guido van Rossum 1995-06-22 18:48:48 +00:00
parent 2d95706f68
commit 4cdcef7e29
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/httplib.py
View File

@ -12,6 +12,7 @@
# >>> h.putreqest('GET', '/index.html') # >>> h.putreqest('GET', '/index.html')
# >>> h.putheader('Accept', 'text/html') # >>> h.putheader('Accept', 'text/html')
# >>> h.putheader('Accept', 'text/plain') # >>> h.putheader('Accept', 'text/plain')
# >>> h.endheaders()
# >>> errcode, errmsg, headers = h.getreply() # >>> errcode, errmsg, headers = h.getreply()
# >>> if errcode == 200: # >>> if errcode == 200:
# ... f = h.getfile() # ... f = h.getfile()
@ -67,6 +68,7 @@ class HTTP:
self.sock.send(str) self.sock.send(str)
def putrequest(self, request, selector): def putrequest(self, request, selector):
if not selector: selector = '/'
str = '%s %s %s\r\n' % (request, selector, HTTP_VERSION) str = '%s %s %s\r\n' % (request, selector, HTTP_VERSION)
self.send(str) self.send(str)
@ -77,13 +79,9 @@ class HTTP:
def endheaders(self): def endheaders(self):
self.send('\r\n') self.send('\r\n')
def endrequest(self):
if self.debuglevel > 0: print 'shutdown: 1'
self.sock.shutdown(1)
def getreply(self): def getreply(self):
self.endrequest()
self.file = self.sock.makefile('r') self.file = self.sock.makefile('r')
self.sock = None
line = self.file.readline() line = self.file.readline()
if self.debuglevel > 0: print 'reply:', `line` if self.debuglevel > 0: print 'reply:', `line`
if replyprog.match(line) < 0: if replyprog.match(line) < 0:
@ -92,7 +90,7 @@ class HTTP:
errcode, errmsg = replyprog.group(1, 2) errcode, errmsg = replyprog.group(1, 2)
errcode = string.atoi(errcode) errcode = string.atoi(errcode)
errmsg = string.strip(errmsg) errmsg = string.strip(errmsg)
self.headers = rfc822.Message(self.file) self.headers = rfc822.Message(self.file, 0)
return errcode, errmsg, self.headers return errcode, errmsg, self.headers
def getfile(self): def getfile(self):