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

fix encoding issues in Linux

Browse source
This commit is contained in:
guillermooo 2012-09-02 10:59:33 +02:00
commit c02926e2ad
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pelican/tools/pelican_quickstart.py
View file

@ -31,23 +31,23 @@ CONF = {
} }
def decoding_maybe(f): def decoding_strings(f):
running_windows = (os.name == 'nt')
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
out = f(*args, **kwargs) out = f(*args, **kwargs)
if isinstance(out, basestring) and running_windows: if isinstance(out, basestring):
# todo: make encoding configurable?
return out.decode(sys.stdin.encoding) return out.decode(sys.stdin.encoding)
return out return out
return wrapper return wrapper
def get_template(name): def get_template(name, as_encoding='utf-8'):
template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name)) template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
if not os.path.isfile(template): if not os.path.isfile(template):
raise RuntimeError("Cannot open {0}".format(template)) raise RuntimeError("Cannot open {0}".format(template))
with open(template, 'r') as fd: with codecs.open(template, 'r', as_encoding) as fd:
line = fd.readline() line = fd.readline()
while line: while line:
yield line yield line
@ -55,7 +55,7 @@ def get_template(name):
fd.close() fd.close()
@decoding_maybe @decoding_strings
def ask(question, answer=str, default=None, l=None): def ask(question, answer=str, default=None, l=None):
if answer == str: if answer == str:
r = '' r = ''
@ -209,7 +209,7 @@ Please answer the following questions so this script can generate the files need
print('Error: {0}'.format(e)) print('Error: {0}'.format(e))
try: try:
with open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w') as fd: with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w', 'utf-8') as fd:
for line in get_template('publishconf.py'): for line in get_template('publishconf.py'):
template = string.Template(line) template = string.Template(line)
fd.write(template.safe_substitute(CONF)) fd.write(template.safe_substitute(CONF))
@ -219,7 +219,7 @@ Please answer the following questions so this script can generate the files need
if mkfile: if mkfile:
try: try:
with open(os.path.join(CONF['basedir'], 'Makefile'), 'w') as fd: with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
for line in get_template('Makefile'): for line in get_template('Makefile'):
template = string.Template(line) template = string.Template(line)
fd.write(template.safe_substitute(CONF)) fd.write(template.safe_substitute(CONF))
@ -229,7 +229,7 @@ Please answer the following questions so this script can generate the files need
if develop: if develop:
try: try:
with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd: with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:
for line in get_template('develop_server.sh'): for line in get_template('develop_server.sh'):
template = string.Template(line) template = string.Template(line)
fd.write(template.safe_substitute(CONF)) fd.write(template.safe_substitute(CONF))