[CalendarServer-changes] [14442] CalendarServer/branches/users/pg8000

[source_changes at macosforge.org]

Revision: 14442
          http://trac.calendarserver.org//changeset/14442
Author:   wsanchez at apple.com
Date:     2015-02-19 11:53:37 -0800 (Thu, 19 Feb 2015)
Log Message:
-----------
Use pg8000 module.

Modified Paths:
--------------
    CalendarServer/branches/users/pg8000/calendarserver/tap/util.py
    CalendarServer/branches/users/pg8000/requirements-stable.txt
    CalendarServer/branches/users/pg8000/setup.py

Modified: CalendarServer/branches/users/pg8000/calendarserver/tap/util.py
===================================================================
--- CalendarServer/branches/users/pg8000/calendarserver/tap/util.py	2015-02-19 02:16:45 UTC (rev 14441)
+++ CalendarServer/branches/users/pg8000/calendarserver/tap/util.py	2015-02-19 19:53:37 UTC (rev 14442)
@@ -161,8 +161,8 @@
     """
     Create a postgres DB-API connector from the given configuration.
     """
-    import pgdb
-    return DBAPIConnector(pgdb, postgresPreflight, config.DSN).connect
+    import pg8000 as postgres
+    return DBAPIConnector(postgres, postgresPreflight, config.DSN).connect
 
 
 

Modified: CalendarServer/branches/users/pg8000/requirements-stable.txt
===================================================================
--- CalendarServer/branches/users/pg8000/requirements-stable.txt	2015-02-19 02:16:45 UTC (rev 14441)
+++ CalendarServer/branches/users/pg8000/requirements-stable.txt	2015-02-19 19:53:37 UTC (rev 14442)
@@ -36,7 +36,7 @@
             #pyOpenSSL
         pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14404#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14441#egg=twextpy
         cffi==0.8.6
             pycparser==2.10
         #twisted
@@ -52,7 +52,7 @@
             #pyobjc-framework-OpenDirectory  # Use system module
 
         # [Postgres] extra
-            PyGreSQL==4.1.1
+            pg8000==1.10.1
 
         # [Oracle] extra
             #cx_Oracle==5.1.3  # Not in PyPI

Modified: CalendarServer/branches/users/pg8000/setup.py
===================================================================
--- CalendarServer/branches/users/pg8000/setup.py	2015-02-19 02:16:45 UTC (rev 14441)
+++ CalendarServer/branches/users/pg8000/setup.py	2015-02-19 19:53:37 UTC (rev 14442)
@@ -271,7 +271,7 @@
     "LDAP": ["twextpy[LDAP]"],
     "OpenDirectory": ["twextpy[OpenDirectory]"],
     "Oracle": ["twextpy[Oracle]", "cx_Oracle"],
-    "Postgres": ["twextpy[Postgres]", "PyGreSQL"],
+    "Postgres": ["twextpy[Postgres]", "pg8000"],
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150219/462b8dc7/attachment-0001.html>