github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2514 from rask004/fix-2487

Browse source 
Fix pelican-import error regarding wp-attach and Unicode
This commit is contained in:
Justin Mayer 2019-03-07 21:13:37 +01:00 • committed by GitHub
commit d9e98a5a39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pelican/tools/pelican_import.py
View file

@ -13,7 +13,7 @@ from codecs import open
from collections import defaultdict from collections import defaultdict
from six.moves.urllib.error import URLError from six.moves.urllib.error import URLError
from six.moves.urllib.parse import urlparse from six.moves.urllib.parse import quote, urlparse, urlsplit, urlunsplit
from six.moves.urllib.request import urlretrieve from six.moves.urllib.request import urlretrieve
# because logging.setLoggerClass has to be called before logging.getLogger # because logging.setLoggerClass has to be called before logging.getLogger
@ -728,6 +728,12 @@ def download_attachments(output_path, urls):
if sys.platform != 'win32' or ':' not in item: if sys.platform != 'win32' or ':' not in item:
localpath = os.path.join(localpath, item) localpath = os.path.join(localpath, item)
full_path = os.path.join(output_path, localpath) full_path = os.path.join(output_path, localpath)
# Generate percent-encoded URL
scheme, netloc, path, query, fragment = urlsplit(url)
path = quote(path)
url = urlunsplit((scheme, netloc, path, query, fragment))
if not os.path.exists(full_path): if not os.path.exists(full_path):
os.makedirs(full_path) os.makedirs(full_path)
print('downloading {}'.format(filename)) print('downloading {}'.format(filename))