heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/gmg_commands/batchaddmedia.py
View File

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

1
setup.py
View File

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