weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Further remove python2-isms

Browse source
This commit is contained in:
Deniz Turgut 2019-11-17 19:19:37 +03:00 • committed by Kevin Yap
commit 49bc6ed47f
11 changed files with 35 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/tools/pelican_import.py
View file

@ -8,8 +8,8 @@ import re
import subprocess
import sys
import time
from codecs import open
from collections import defaultdict
from html import unescape
from urllib.error import URLError
from urllib.parse import quote, urlparse, urlsplit, urlunsplit
from urllib.request import urlretrieve
@ -19,11 +19,6 @@ from pelican.log import init
from pelican.settings import read_settings
from pelican.utils import SafeDatetime, slugify
try:
from html import unescape # py3.5+
except ImportError:
from html.parser import HTMLParser
unescape = HTMLParser().unescape
logger = logging.getLogger(__name__)

17
pelican/tools/pelican_quickstart.py
View file

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-
import argparse
import codecs
import locale
import os
@ -309,8 +308,8 @@ needed by Pelican.
print('Error: {0}'.format(e))
try:
with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
'w', 'utf-8') as fd:
with open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
'w', 'utf-8') as fd:
conf_python = dict()
for key, value in CONF.items():
conf_python[key] = repr(value)
@ -322,8 +321,8 @@ needed by Pelican.
print('Error: {0}'.format(e))
try:
with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'),
'w', 'utf-8') as fd:
with open(os.path.join(CONF['basedir'], 'publishconf.py'),
'w', 'utf-8') as fd:
_template = _jinja_env.get_template('publishconf.py.jinja2')
fd.write(_template.render(**CONF))
fd.close()
@ -332,16 +331,16 @@ needed by Pelican.
if automation:
try:
with codecs.open(os.path.join(CONF['basedir'], 'tasks.py'),
'w', 'utf-8') as fd:
with open(os.path.join(CONF['basedir'], 'tasks.py'),
'w', 'utf-8') as fd:
_template = _jinja_env.get_template('tasks.py.jinja2')
fd.write(_template.render(**CONF))
fd.close()
except OSError as e:
print('Error: {0}'.format(e))
try:
with codecs.open(os.path.join(CONF['basedir'], 'Makefile'),
'w', 'utf-8') as fd:
with open(os.path.join(CONF['basedir'], 'Makefile'),
'w', 'utf-8') as fd:
py_v = 'python3'
_template = _jinja_env.get_template('Makefile.jinja2')
fd.write(_template.render(py_v=py_v, **CONF))