[CalendarServer-changes] [14451] CalendarServer/branches/users/pg8000-1

[source_changes at macosforge.org]

Revision: 14451
          http://trac.calendarserver.org//changeset/14451
Author:   wsanchez at apple.com
Date:     2015-02-19 15:29:52 -0800 (Thu, 19 Feb 2015)
Log Message:
-----------
pgdb -> pg8000

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

Modified: CalendarServer/branches/users/pg8000-1/calendarserver/tap/util.py
===================================================================
--- CalendarServer/branches/users/pg8000-1/calendarserver/tap/util.py	2015-02-19 23:20:44 UTC (rev 14450)
+++ CalendarServer/branches/users/pg8000-1/calendarserver/tap/util.py	2015-02-19 23:29:52 UTC (rev 14451)
@@ -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-1/requirements-stable.txt
===================================================================
--- CalendarServer/branches/users/pg8000-1/requirements-stable.txt	2015-02-19 23:20:44 UTC (rev 14450)
+++ CalendarServer/branches/users/pg8000-1/requirements-stable.txt	2015-02-19 23:29:52 UTC (rev 14451)
@@ -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-1/setup.py
===================================================================
--- CalendarServer/branches/users/pg8000-1/setup.py	2015-02-19 23:20:44 UTC (rev 14450)
+++ CalendarServer/branches/users/pg8000-1/setup.py	2015-02-19 23:29:52 UTC (rev 14451)
@@ -271,7 +271,7 @@
     "LDAP": ["twextpy[LDAP]"],
     "OpenDirectory": ["twextpy[OpenDirectory]"],
     "Oracle": ["twextpy[Oracle]", "cx_Oracle"],
-    "Postgres": ["twextpy[Postgres]", "PyGreSQL"],
+    "Postgres": ["twextpy[Postgres]", "pg8000"],
 }
 
 

Modified: CalendarServer/branches/users/pg8000-1/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/pg8000-1/twistedcaldav/directory/calendaruserproxy.py	2015-02-19 23:20:44 UTC (rev 14450)
+++ CalendarServer/branches/users/pg8000-1/twistedcaldav/directory/calendaruserproxy.py	2015-02-19 23:29:52 UTC (rev 14451)
@@ -875,7 +875,7 @@
     def __init__(self, host, database, user=None, password=None, dbtype=None):
 
         ADBAPIPostgreSQLMixin.__init__(self,)
-        ProxyDB.__init__(self, "Proxies", "pgdb", (), host=host, database=database, user=user, password=password,)
+        ProxyDB.__init__(self, "Proxies", "pg8000", (), host=host, database=database, user=user, password=password,)
         if dbtype:
             ProxyDB.schema_type = dbtype
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150219/cd63dabd/attachment-0001.html>