team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  01walid (01walid)
------------------------------------------------------------
revno: 500 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Sun 2013-01-06 02:10:06 +0100
message:
  Merge branch 'master' of github.com:01walid/alfanous
  
  Conflicts:
  	src/alfanous-django/settings.py
modified:
  src/alfanous-django/settings.ini.proto
  src/alfanous-django/settings.py


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription

=== modified file 'src/alfanous-django/settings.ini.proto'
--- src/alfanous-django/settings.ini.proto	2013-01-06 00:52:28 +0000
+++ src/alfanous-django/settings.ini.proto	2013-01-06 01:10:06 +0000
@@ -32,7 +32,7 @@
 EMAIL_HOST: localhost
 
 # the [error mail] and [404 mail] sections are special. Just add lines with
-#  full name: email_address@xxxxxxxxx
+# full name: email_address@xxxxxxxxx
 # each section must be present but may be empty.
 [error mail]
 Adam Smith: adam@localhost

=== modified file 'src/alfanous-django/settings.py'
--- src/alfanous-django/settings.py	2013-01-06 00:52:28 +0000
+++ src/alfanous-django/settings.py	2013-01-06 01:10:06 +0000
@@ -7,7 +7,7 @@
 from ConfigParser import RawConfigParser
 
 
-# set you setting path here.
+# set the path of your private config file here.
 # the file have to be a system-config like, ini-style file, see settings.ini.proto for a prototype
 configFile = "./settings.ini.proto" # e,g. '/etc/whatever/settings.ini'
 
@@ -18,7 +18,7 @@
 config = RawConfigParser()
 config.read(configFile)
 
-# fetching critical info from the cofig file
+# fetching critical info from the config file
 DATABASE_USER = config.get('database', 'DATABASE_USER')
 DATABASE_PASSWORD = config.get('database', 'DATABASE_PASSWORD')
 DATABASE_HOST = config.get('database', 'DATABASE_HOST')
@@ -26,9 +26,8 @@
 DATABASE_ENGINE = config.get('database', 'DATABASE_ENGINE')
 DATABASE_NAME = config.get('database', 'DATABASE_NAME')
 # TEST_DATABASE_NAME = config.get('database', 'TESTSUITE_DATABASE_NAME')
-
-MY_DEBUG = config.get('debug', 'DEBUG')
-MY_TEMPLATE_DEBUG = config.get('debug', 'TEMPLATE_DEBUG')
+MY_DEBUG = config.get( 'debug', 'DEBUG' ) in ["true", "True"]
+MY_TEMPLATE_DEBUG = config.get( 'debug', 'TEMPLATE_DEBUG' ) in ["true", "True"]
 
 MY_SECRET_KEY =  config.get('secrets', 'SECRET_KEY')
 
@@ -40,7 +39,7 @@
 #     Static and Public settings       #
 ########################################
 
-DEBUG = MY_DEBUG 
+DEBUG = MY_DEBUG
 TEMPLATE_DEBUG = MY_TEMPLATE_DEBUG 
 
 ADMINS = (
@@ -51,12 +50,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': DATABASE_ENGINE,                  # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': DATABASE_NAME,                      # Or path to database file if using sqlite3.
-        'USER': DATABASE_USER,                      # Not used with sqlite3.
-        'PASSWORD': DATABASE_PASSWORD,                  # Not used with sqlite3.
-        'HOST': DATABASE_HOST,                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': DATABASE_PORT,                      # Set to empty string for default. Not used with sqlite3.
+        'ENGINE': DATABASE_ENGINE,      # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': DATABASE_NAME,          # Or path to database file if using sqlite3.
+        'USER': DATABASE_USER,          # Not used with sqlite3.
+        'PASSWORD': DATABASE_PASSWORD,  # Not used with sqlite3.
+        'HOST': DATABASE_HOST,          # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': DATABASE_PORT,          # Set to empty string for default. Not used with sqlite3.
     }
 }
 
@@ -129,6 +128,7 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = MY_SECRET_KEY
 
+
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',