summaryrefslogtreecommitdiff
path: root/config.py
diff options
context:
space:
mode:
authorjlg <devnull@localhost>2006-07-07 08:45:41 +0000
committerjlg <devnull@localhost>2006-07-07 08:45:41 +0000
commitaa58beaf98f2965ef3ce59775e8e664659fa5973 (patch)
tree85bd7b405e8d7988ece8545450c06da20c3adf35 /config.py
parentc3671fce06e0cb3b4205eafa37b461a943965486 (diff)
downloaddecorator-aa58beaf98f2965ef3ce59775e8e664659fa5973.tar.gz
Mega-patch from the first day of the Cheese Shop sprinting.
* update to new pydotorg template (johannes) * Bugger off search bots. (richard) * "handle" strange charsets in PKG-INFO file uploads (richard) * fix strange xml-rpc search() implementation (richard) * add sidebar links in new template (richard) * remove search, index and search_form actions. Index is useless now that Cheese Shop is so large. Search form has been replaced by a Google search. (johannes) * remove random banner function, not necessary in the new design. (johannes) * prevent date-field from wrapping around (bjorn stabell) * better naming for xml-rpc functions (richard/andrew dalke) * Add a radio button to switch between searching cheeseshop.python.org and python.org. (johannes) * refactor query_info from returning text to template to returning a structure the template can work on (bjorn stabell) * trim leading whitespace from rest docs (felix wiemann) * move documentation into 'doc' directory (johannes) * remove old flamenco implementation (johannes)
Diffstat (limited to 'config.py')
-rw-r--r--config.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/config.py b/config.py
index abd61c9..0f9241e 100644
--- a/config.py
+++ b/config.py
@@ -9,7 +9,10 @@ class Config:
c.read(configfile)
self.database_name = c.get('database', 'name')
self.database_user = c.get('database', 'user')
- self.database_pw = c.get('database', 'password')
+ if c.has_option('database', 'password'):
+ self.database_pw = c.get('database', 'password')
+ else:
+ self.database_pw = None
self.database_files_dir = c.get('database', 'files_dir')
self.mailhost = c.get('webui', 'mailhost')