ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8 from normanjaeckel/master

Browse Source 
Fix encoding error #349
This commit is contained in:
Oskar Hahn 2012-08-24 09:19:55 -07:00
commit 7321de2400
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openslides/main.py
View File

@ -25,8 +25,10 @@ import webbrowser
import django.conf import django.conf
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
CONFIG_TEMPLATE = """ CONFIG_TEMPLATE = """#!/usr/bin/env python
from openslides.openslides_settings import * # -*- coding: utf-8 -*-
from openslides.openslides_global_settings import *
# Use 'DEBUG = True' to get more details for server errors # Use 'DEBUG = True' to get more details for server errors
# (Default for relaeses: 'False') # (Default for relaeses: 'False')
@ -63,6 +65,13 @@ INSTALLED_APPS += INSTALLED_PLUGINS
KEY_LENGTH = 30 KEY_LENGTH = 30
_fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
def _fs2unicode(s):
if isinstance(s, unicode):
return s
return s.decode(_fs_encoding)
def main(argv=None): def main(argv=None):
if argv is None: if argv is None:
argv = sys.argv[1:] argv = sys.argv[1:]
@ -89,7 +98,7 @@ def main(argv=None):
# Find the path to the settings # Find the path to the settings
settings = opts.settings or \ settings = opts.settings or \
os.path.expanduser('~/.openslides/openslidessettings.py') os.path.join(os.path.expanduser('~'),'.openslides','openslides_personal_settings.py')
# Create settings if necessary # Create settings if necessary
if not os.path.exists(settings): if not os.path.exists(settings):
@ -128,7 +137,7 @@ def create_settings(settings):
setting_content = CONFIG_TEMPLATE % dict( setting_content = CONFIG_TEMPLATE % dict(
default_key=base64.b64encode(os.urandom(KEY_LENGTH)), default_key=base64.b64encode(os.urandom(KEY_LENGTH)),
dbpath=os.path.join(path_to_dir, 'database.db')) dbpath=_fs2unicode((os.path.join(path_to_dir, 'database.db'))))
if not os.path.exists(path_to_dir): if not os.path.exists(path_to_dir):
os.makedirs(path_to_dir) os.makedirs(path_to_dir)

0
openslides/openslides_settings.py → openslides/openslides_global_settings.py Executable file → Normal file
View File