Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
4926fae5
Commit
4926fae5
authored
Aug 03, 2007
by
Jeremy Hylton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make consistent use of "" for string literals in new classes.
parent
a06a8fe6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
Lib/httplib.py
Lib/httplib.py
+18
-18
No files found.
Lib/httplib.py
View file @
4926fae5
...
@@ -323,7 +323,7 @@ class HTTPResponse:
...
@@ -323,7 +323,7 @@ class HTTPResponse:
# accepts iso-8859-1.
# accepts iso-8859-1.
def
__init__
(
self
,
sock
,
debuglevel
=
0
,
strict
=
0
,
method
=
None
):
def
__init__
(
self
,
sock
,
debuglevel
=
0
,
strict
=
0
,
method
=
None
):
self
.
fp
=
sock
.
makefile
(
'rb'
,
0
)
self
.
fp
=
sock
.
makefile
(
"rb"
,
0
)
self
.
debuglevel
=
debuglevel
self
.
debuglevel
=
debuglevel
self
.
strict
=
strict
self
.
strict
=
strict
self
.
_method
=
method
self
.
_method
=
method
...
@@ -359,7 +359,7 @@ class HTTPResponse:
...
@@ -359,7 +359,7 @@ class HTTPResponse:
# empty version will cause next test to fail and status
# empty version will cause next test to fail and status
# will be treated as 0.9 response.
# will be treated as 0.9 response.
version
=
""
version
=
""
if
not
version
.
startswith
(
'HTTP/'
):
if
not
version
.
startswith
(
"HTTP/"
):
if
self
.
strict
:
if
self
.
strict
:
self
.
close
()
self
.
close
()
raise
BadStatusLine
(
line
)
raise
BadStatusLine
(
line
)
...
@@ -397,11 +397,11 @@ class HTTPResponse:
...
@@ -397,11 +397,11 @@ class HTTPResponse:
self
.
status
=
status
self
.
status
=
status
self
.
reason
=
reason
.
strip
()
self
.
reason
=
reason
.
strip
()
if
version
==
'HTTP/1.0'
:
if
version
==
"HTTP/1.0"
:
self
.
version
=
10
self
.
version
=
10
elif
version
.
startswith
(
'HTTP/1.'
):
elif
version
.
startswith
(
"HTTP/1."
):
self
.
version
=
11
# use HTTP/1.1 code for HTTP/1.x where x>=1
self
.
version
=
11
# use HTTP/1.1 code for HTTP/1.x where x>=1
elif
version
==
'HTTP/0.9'
:
elif
version
==
"HTTP/0.9"
:
self
.
version
=
9
self
.
version
=
9
else
:
else
:
raise
UnknownProtocol
(
version
)
raise
UnknownProtocol
(
version
)
...
@@ -416,13 +416,13 @@ class HTTPResponse:
...
@@ -416,13 +416,13 @@ class HTTPResponse:
self
.
msg
=
HTTPMessage
(
self
.
fp
,
0
)
self
.
msg
=
HTTPMessage
(
self
.
fp
,
0
)
if
self
.
debuglevel
>
0
:
if
self
.
debuglevel
>
0
:
for
hdr
in
self
.
msg
.
headers
:
for
hdr
in
self
.
msg
.
headers
:
print
(
"header:"
,
hdr
,
end
=
' '
)
print
(
"header:"
,
hdr
,
end
=
" "
)
# don't let the msg keep an fp
# don't let the msg keep an fp
self
.
msg
.
fp
=
None
self
.
msg
.
fp
=
None
# are we using the chunked-style of transfer encoding?
# are we using the chunked-style of transfer encoding?
tr_enc
=
self
.
msg
.
getheader
(
'transfer-encoding'
)
tr_enc
=
self
.
msg
.
getheader
(
"transfer-encoding"
)
if
tr_enc
and
tr_enc
.
lower
()
==
"chunked"
:
if
tr_enc
and
tr_enc
.
lower
()
==
"chunked"
:
self
.
chunked
=
1
self
.
chunked
=
1
self
.
chunk_left
=
None
self
.
chunk_left
=
None
...
@@ -434,7 +434,7 @@ class HTTPResponse:
...
@@ -434,7 +434,7 @@ class HTTPResponse:
# do we have a Content-Length?
# do we have a Content-Length?
# NOTE: RFC 2616, S4.4, #3 says we ignore this if tr_enc is "chunked"
# NOTE: RFC 2616, S4.4, #3 says we ignore this if tr_enc is "chunked"
length
=
self
.
msg
.
getheader
(
'content-length'
)
length
=
self
.
msg
.
getheader
(
"content-length"
)
if
length
and
not
self
.
chunked
:
if
length
and
not
self
.
chunked
:
try
:
try
:
self
.
length
=
int
(
length
)
self
.
length
=
int
(
length
)
...
@@ -446,7 +446,7 @@ class HTTPResponse:
...
@@ -446,7 +446,7 @@ class HTTPResponse:
# does the body have a fixed length? (of zero)
# does the body have a fixed length? (of zero)
if
(
status
==
NO_CONTENT
or
status
==
NOT_MODIFIED
or
if
(
status
==
NO_CONTENT
or
status
==
NOT_MODIFIED
or
100
<=
status
<
200
or
# 1xx codes
100
<=
status
<
200
or
# 1xx codes
self
.
_method
==
'HEAD'
):
self
.
_method
==
"HEAD"
):
self
.
length
=
0
self
.
length
=
0
# if the connection remains open, and we aren't using chunked, and
# if the connection remains open, and we aren't using chunked, and
...
@@ -458,11 +458,11 @@ class HTTPResponse:
...
@@ -458,11 +458,11 @@ class HTTPResponse:
self
.
will_close
=
1
self
.
will_close
=
1
def
_check_close
(
self
):
def
_check_close
(
self
):
conn
=
self
.
msg
.
getheader
(
'connection'
)
conn
=
self
.
msg
.
getheader
(
"connection"
)
if
self
.
version
==
11
:
if
self
.
version
==
11
:
# An HTTP/1.1 proxy is assumed to stay open unless
# An HTTP/1.1 proxy is assumed to stay open unless
# explicitly closed.
# explicitly closed.
conn
=
self
.
msg
.
getheader
(
'connection'
)
conn
=
self
.
msg
.
getheader
(
"connection"
)
if
conn
and
"close"
in
conn
.
lower
():
if
conn
and
"close"
in
conn
.
lower
():
return
True
return
True
return
False
return
False
...
@@ -471,7 +471,7 @@ class HTTPResponse:
...
@@ -471,7 +471,7 @@ class HTTPResponse:
# connections, using rules different than HTTP/1.1.
# connections, using rules different than HTTP/1.1.
# For older HTTP, Keep-Alive indiciates persistent connection.
# For older HTTP, Keep-Alive indiciates persistent connection.
if
self
.
msg
.
getheader
(
'keep-alive'
):
if
self
.
msg
.
getheader
(
"keep-alive"
):
return
False
return
False
# At least Akamai returns a "Connection: Keep-Alive" header,
# At least Akamai returns a "Connection: Keep-Alive" header,
...
@@ -480,7 +480,7 @@ class HTTPResponse:
...
@@ -480,7 +480,7 @@ class HTTPResponse:
return
False
return
False
# Proxy-Connection is a netscape hack.
# Proxy-Connection is a netscape hack.
pconn
=
self
.
msg
.
getheader
(
'proxy-connection'
)
pconn
=
self
.
msg
.
getheader
(
"proxy-connection"
)
if
pconn
and
"keep-alive"
in
pconn
.
lower
():
if
pconn
and
"keep-alive"
in
pconn
.
lower
():
return
False
return
False
...
@@ -505,7 +505,7 @@ class HTTPResponse:
...
@@ -505,7 +505,7 @@ class HTTPResponse:
def
read
(
self
,
amt
=
None
):
def
read
(
self
,
amt
=
None
):
if
self
.
fp
is
None
:
if
self
.
fp
is
None
:
return
''
return
""
if
self
.
chunked
:
if
self
.
chunked
:
return
self
.
_read_chunked
(
amt
)
return
self
.
_read_chunked
(
amt
)
...
@@ -537,14 +537,14 @@ class HTTPResponse:
...
@@ -537,14 +537,14 @@ class HTTPResponse:
def
_read_chunked
(
self
,
amt
):
def
_read_chunked
(
self
,
amt
):
assert
self
.
chunked
!=
_UNKNOWN
assert
self
.
chunked
!=
_UNKNOWN
chunk_left
=
self
.
chunk_left
chunk_left
=
self
.
chunk_left
value
=
''
value
=
""
# XXX This accumulates chunks by repeated string concatenation,
# XXX This accumulates chunks by repeated string concatenation,
# which is not efficient as the number or size of chunks gets big.
# which is not efficient as the number or size of chunks gets big.
while
True
:
while
True
:
if
chunk_left
is
None
:
if
chunk_left
is
None
:
line
=
self
.
fp
.
readline
()
line
=
self
.
fp
.
readline
()
i
=
line
.
find
(
';'
)
i
=
line
.
find
(
";"
)
if
i
>=
0
:
if
i
>=
0
:
line
=
line
[:
i
]
# strip chunk-extensions
line
=
line
[:
i
]
# strip chunk-extensions
chunk_left
=
int
(
line
,
16
)
chunk_left
=
int
(
line
,
16
)
...
@@ -573,7 +573,7 @@ class HTTPResponse:
...
@@ -573,7 +573,7 @@ class HTTPResponse:
### note: we shouldn't have any trailers!
### note: we shouldn't have any trailers!
while
True
:
while
True
:
line
=
self
.
fp
.
readline
()
line
=
self
.
fp
.
readline
()
if
line
==
'
\
r
\
n
'
:
if
line
==
"
\
r
\
n
"
:
break
break
# we read everything; close the "file"
# we read everything; close the "file"
...
@@ -602,7 +602,7 @@ class HTTPResponse:
...
@@ -602,7 +602,7 @@ class HTTPResponse:
raise
IncompleteRead
(
s
)
raise
IncompleteRead
(
s
)
s
.
append
(
chunk
)
s
.
append
(
chunk
)
amt
-=
len
(
chunk
)
amt
-=
len
(
chunk
)
return
''
.
join
(
s
)
return
""
.
join
(
s
)
def
getheader
(
self
,
name
,
default
=
None
):
def
getheader
(
self
,
name
,
default
=
None
):
if
self
.
msg
is
None
:
if
self
.
msg
is
None
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment