mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-20 15:18:08 +02:00
Resolve merge conflict in test_slave.html.
This commit is contained in:
commit
f4b169ddba
3 changed files with 123 additions and 168 deletions
|
@ -99,7 +99,7 @@ class PDFTestHandler(BaseHTTPRequestHandler):
|
|||
self.send_header("Content-Type", MIMEs[ext])
|
||||
self.send_header("Content-Length", os.path.getsize(path))
|
||||
self.end_headers()
|
||||
with open(path) as f:
|
||||
with open(path, "rb") as f:
|
||||
self.wfile.write(f.read())
|
||||
|
||||
def do_GET(self):
|
||||
|
@ -275,7 +275,7 @@ def downloadLinkedPDFs(manifestList):
|
|||
sys.stdout.flush()
|
||||
response = urllib2.urlopen(link)
|
||||
|
||||
with open(f, 'w') as out:
|
||||
with open(f, 'wb') as out:
|
||||
out.write(response.read())
|
||||
|
||||
print 'done'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue