add database port as an option in config

3 files changed, 11 insertions, 2 deletions

diff --git a/config.ini.template b/config.ini.template
index cde6a74..5250fdf 100644
--- a/config.ini.template
+++ b/config.ini.template
@@ -2,6 +2,8 @@
 driver = postgresql2
 name = packages
 user = pypi
+# host = hostname
+# port = 5432
 files_dir = /MacDev/svn.python.org/pypi-pep345/files
 docs_dir = /MacDev/svn.python.org/pypi-pep345/docs
 
diff --git a/config.py b/config.py
index 7f9356a..634aacd 100644
--- a/config.py
+++ b/config.py
@@ -21,6 +21,10 @@ class Config:
             self.database_host = c.get('database', 'host')
         else:
             self.database_host = None
+        if c.has_option('database', 'port'):
+            self.database_port = c.getint('database', 'port')
+        else:
+            self.database_port = None
         self.database_files_dir = c.get('database', 'files_dir')
         self.database_docs_dir = c.get('database', 'docs_dir')
         if c.has_option('database', 'pubsubhubbub'):
diff --git a/store.py b/store.py
index 4dceac2..d315c4a 100644
--- a/store.py
+++ b/store.py
@@ -2075,17 +2075,20 @@ class Store:
         '''
         global connection
         # ensure files are group readable and writable
-        cd = dict(database=self.config.database_name, user=self.config.database_user)
+        cd = dict(database=self.config.database_name,
+            user=self.config.database_user)
         if self.config.database_pw:
             cd['password'] = self.config.database_pw
         if self.config.database_host:
             cd['host'] = self.config.database_host
+        if self.config.database_port:
+            cd['port'] = self.config.database_port
         if keep_conn and connection:
             self._conn = connection
             # Rollback any uncommitted earlier change
             try:
                 self._conn.rollback()
-            except psycopg2.InterfaceError, e:
+            except psycopg2.InterfaceError:
                 # already closed
                 connection = None
                 return self.open()