Skip to content

add support for file parameters #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for file parameters #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions uws/UWS/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import urllib
import urllib2
import base64
import mimetypes
import re

from urlparse import urlparse

Expand Down Expand Up @@ -83,14 +85,35 @@ def get(self, path, params=None):
return response

def post(self, path, args):
params = urllib.urlencode(args)
# prepare multipart/form-data request
limit = '--------UWS_Client_Separator'
crlf = '\r\n'
params_list = []
for key in args:
params_list.append('--' + limit)
if re.match('^@', args[key]):
dummy = 'Content-Disposition: form-data; '
dummy += 'name="%s"; filename="%s"' % (key, args[key][1:])
params_list.append(dummy)
dummy = 'Content-Type: '
dummy += (mimetypes.guess_type(args[key])[0] or 'application/octet-stream')
params_list.append(dummy)
params_list.append('')
params_list.append(open(args[key][1:]).read())
else:
params_list.append('Content-Disposition: form-data; name="%s"'%key)
params_list.append('')
params_list.append(args[key])
params_list.append('--' + limit + '--')
params_list.append('')
params = crlf.join(params_list)

if path:
destination_url = self.base_path + "/" + path
else:
destination_url = self.base_path

self.headers['Content-type'] = "application/x-www-form-urlencoded"
self.headers['Content-type'] = "multipart/form-data; boundary=%s"%limit
self.connection.request("POST", destination_url, body=params, headers=self.headers)
response = self.connection.getresponse()
response.read() # read body of request so we can send another
Expand Down