1
0
Fork 0
forked from github/pelican

fix encoding problem in Windows

This commit is contained in:
guillermooo 2012-09-02 09:26:58 +02:00
commit fc749755df

View file

@ -4,6 +4,8 @@
import os
import string
import argparse
import sys
import codecs
from pelican import __version__
@ -29,6 +31,16 @@ CONF = {
}
def decoding_maybe(f):
running_windows = (os.name == 'nt')
def wrapper(*args, **kwargs):
out = f(*args, **kwargs)
if isinstance(out, basestring) and running_windows:
return out.decode(sys.stdin.encoding)
return out
return wrapper
def get_template(name):
template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
@ -43,6 +55,7 @@ def get_template(name):
fd.close()
@decoding_maybe
def ask(question, answer=str, default=None, l=None):
if answer == str:
r = ''
@ -167,7 +180,7 @@ Please answer the following questions so this script can generate the files need
if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
@ -187,7 +200,7 @@ Please answer the following questions so this script can generate the files need
print('Error: {0}'.format(e))
try:
with open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w') as fd:
with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:
for line in get_template('pelicanconf.py'):
template = string.Template(line)
fd.write(template.safe_substitute(CONF))