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

Fix exceptions if project path contains non-utf8 characters (#204)

Browse Source 
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).

Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
This commit is contained in:
Andy Kittner 2012-05-30 23:30:24 +02:00
parent 8cdc062628
commit 29057b8b87
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openslides/openslides_settings.py Normal file → Executable file
View File

@ -11,8 +11,15 @@
""" """
import os import os
import sys
from django.conf.global_settings import * from django.conf.global_settings import *
_fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
def _fs2unicode(s):
if isinstance(s, unicode):
return s
return s.decode(_fs_encoding)
SITE_ROOT = os.path.realpath(os.path.dirname(__file__)) SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
#SITE_ROOT = os.path.join(SITE_ROOT, '..') #SITE_ROOT = os.path.join(SITE_ROOT, '..')
@ -23,7 +30,7 @@ AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend', 'opensli
LOGIN_URL = '/login/' LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
DBPATH = os.path.join(os.path.join(SITE_ROOT, '..'), 'database.db') DBPATH = _fs2unicode(os.path.join(os.path.join(SITE_ROOT, '..'), 'database.db'))
DATABASES = { DATABASES = {
'default': { 'default': {
@ -64,7 +71,7 @@ MEDIA_URL = ''
# Absolute path to the directory that holds static media from ``collectstatic`` # Absolute path to the directory that holds static media from ``collectstatic``
# Example: "/home/media/static.lawrence.com/" # Example: "/home/media/static.lawrence.com/"
STATIC_ROOT = os.path.join(SITE_ROOT, '../site-static') STATIC_ROOT = _fs2unicode(os.path.join(SITE_ROOT, '../site-static'))
# URL that handles the media served from STATIC_ROOT. Make sure to use a # URL that handles the media served from STATIC_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases). # trailing slash if there is a path component (optional in other cases).
@ -74,7 +81,7 @@ STATIC_URL = '/static/'
# Additional directories containing static files (not application specific) # Additional directories containing static files (not application specific)
# Examples: "/home/media/lawrence.com/extra-static/" # Examples: "/home/media/lawrence.com/extra-static/"
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(SITE_ROOT, 'static'), _fs2unicode(os.path.join(SITE_ROOT, 'static')),
) )
MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage' MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
@ -100,7 +107,7 @@ TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
os.path.join(SITE_ROOT, 'templates'), _fs2unicode(os.path.join(SITE_ROOT, 'templates')),
) )
INSTALLED_APPS = ( INSTALLED_APPS = (