Added the 'requests' library as a dependency and switched over to using it to

fetch remote pieces of media in the batchupload script
This commit is contained in:
tilly-Q 2014-04-15 13:35:22 -04:00
parent 6fa9b06f9a
commit fbb13abe9a
2 changed files with 5 additions and 5 deletions

View File

@ -15,9 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import tempfile, urllib, tarfile, zipfile, subprocess
import tempfile, tarfile, zipfile, subprocess, requests
from csv import reader as csv_reader
from urlparse import urlparse
import requests
from pyld import jsonld
from mediagoblin.gmg_commands import util as commands_util
@ -151,10 +152,8 @@ zip files and directories"
filename = url.path.split()[-1]
if url.scheme == 'http':
media_file = tempfile.TemporaryFile()
res = urllib.urlopen(url.geturl())
media_file.write(res.read())
media_file.seek(0)
res = requests.get(url.geturl())
media_file = res.raw
elif url.scheme == '':
path = url.path

View File

@ -67,6 +67,7 @@ try:
'oauthlib==0.5.0',
'unidecode',
'jsonschema',
'requests',
## Annoying. Please remove once we can! We only indirectly
## use pbr, and currently it breaks things, presumably till