[SQL-CVS] SQLObject development repository branch master updated. 2.1.0-159-g41f1d8d

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  41f1d8dcd07fd73386aa4fa1f44aae9f1ff9b1e5 (commit)
       via  7098443b63eca23003a5d1c0e18b8bf782559a8e (commit)
      from  18c14963a7a79ff81d1637dbf916a00aab893fba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/41f1d8dcd07fd73386aa4fa1f44aae9f1ff9b1e5

commit 41f1d8dcd07fd73386aa4fa1f44aae9f1ff9b1e5
Merge: 18c1496 7098443
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 9 16:28:13 2015 +0300

    Merge pull request #71 from drnlm/fix_urllib_import
    
    Update urllib usage in sqliteconnection


http://sourceforge.net/p/sqlobject/sqlobject/ci/7098443b63eca23003a5d1c0e18b8bf782559a8e

commit 7098443b63eca23003a5d1c0e18b8bf782559a8e
Author: Neil <ne...@di...>
Date:   Mon Feb 9 13:22:00 2015 +0200

    Update urllib usage in sqliteconnection

diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index b3f009f..d301fb8 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -4,7 +4,10 @@ try:
     from _thread import get_ident
 except ImportError:
     from thread import get_ident
-import urllib
+try:
+    from urllib import quote
+except ImportError:
+    from urllib.parse import quote
 from sqlobject.dbconnection import DBAPI, Boolean
 from sqlobject import col
 from sqlobject.dberrors import *
@@ -130,7 +133,7 @@ class SQLiteConnection(DBAPI):
                 path = "//" + path
             else:
                 path = "///" + path
-            path = urllib.quote(path)
+            path = quote(path)
         return 'sqlite:%s' % path
 
     def getConnection(self):

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/sqlite/sqliteconnection.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository