sqlobject
diff --git a/‎.travis.yml‎
Lines changed: 0 additions & 3 deletions b/‎.travis.yml‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎docs/News.rst‎
Lines changed: 3 additions & 0 deletions b/‎docs/News.rst‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎sqlobject/postgres/pgconnection.py‎
Lines changed: 15 additions & 16 deletions b/‎sqlobject/postgres/pgconnection.py‎
Lines changed: 15 additions & 16 deletions
@@ -74,9 +74,6 @@ matrix:
     - env: TOXENV=py34-postgres-pygresql
     - env: TOXENV=py35-postgres-pygresql
     - env: TOXENV=py36-postgres-pygresql
-    - env: TOXENV=py34-pypostgresql
-    - env: TOXENV=py35-pypostgresql
-    - env: TOXENV=py36-pypostgresql
     - env: TOXENV=py27-sqlite-memory
     - env: TOXENV=py34-sqlite-memory
     - env: TOXENV=py35-sqlite-memory
 
@@ -13,6 +13,9 @@ SQLObject 3.4.0 (master)
 * Python 2.6 is no longer supported. The minimal supported version is
   Python 2.7.
 
+* Encode binary values for py-postgresql driver. This fixes the
+  last remaining problems with the driver.
+
 * Encode/decode binary values for PyGreSQL driver.
 
 * List all drivers in extras_require in setup.py.
 
@@ -2,7 +2,7 @@
 from sqlobject import col
 from sqlobject import dberrors
 from sqlobject import sqlbuilder
-from sqlobject.compat import PY2, unicode_type
+from sqlobject.compat import PY2
 from sqlobject.converters import registerConverter, sqlrepr
 from sqlobject.dbconnection import DBAPI
 
@@ -86,15 +86,13 @@ def __init__(self, dsn=None, host=None, port=None, db=None,
             registerConverter(type(self.module.Binary('')),
                               PsycoBinaryConverter)
         elif driver == 'pygresql':
-            from pg import escape_bytea
+            from pg import escape_bytea as pg_escape_bytea
             self.createBinary = \
-                lambda value, escape_bytea=escape_bytea: escape_bytea(value)
-        elif type(self.module.Binary) in (
-                type, type(PostgresBinaryConverter)) and \
-                type(self.module.Binary(b'')) not in (bytes, unicode_type):
-            # Register a converter for Binary type.
+                lambda value, pg_escape_bytea=pg_escape_bytea: \
+                pg_escape_bytea(value)
+        elif driver in ('py-postgresql', 'pypostgresql'):
             registerConverter(type(self.module.Binary(b'')),
-                              PostgresBinaryConverter)
+                              PypostgresBinaryConverter)
 
         self.db = db
         self.user = user
@@ -541,11 +539,12 @@ def PsycoBinaryConverter(value, db):
     return str(value)
 
 
-if PY2:
-    def PostgresBinaryConverter(value, db):
-        assert db == 'postgres'
-        return sqlrepr(bytes(value), db)
-else:
-    def PostgresBinaryConverter(value, db):
-        assert db == 'postgres'
-        return sqlrepr(value.decode('latin1'), db)
+def escape_bytea(value):
+    return ''.join(
+        ['\\' + (x[2:].rjust(3, '0')) for x in (oct(ord(c)) for c in value)]
+    )
+
+
+def PypostgresBinaryConverter(value, db):
+    assert db == 'postgres'
+    return sqlrepr(escape_bytea(value.decode('latin1')), db)