diff options
author | Sylvain Th?nault <sylvain.thenault@logilab.fr> | 2010-03-01 12:28:39 +0100 |
---|---|---|
committer | Sylvain Th?nault <sylvain.thenault@logilab.fr> | 2010-03-01 12:28:39 +0100 |
commit | 7caefc933cb0fb59c0affc95a9abbd93bec2b487 (patch) | |
tree | adc6a2cc5b69e806cf190bcb395693de53427d64 | |
parent | d8b855b674ba51018a46d6b440e8a7eadd9bf77a (diff) | |
parent | 1c8e6d5c9c8ef52ecaf8a96491714f13ff51ca98 (diff) | |
download | logilab-common-7caefc933cb0fb59c0affc95a9abbd93bec2b487.tar.gz |
merge stable
-rw-r--r-- | db.py | 1 | ||||
-rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -513,6 +513,7 @@ class _PySqlite2Adapter(DBAPIAdapter): return self._cnx.cursor(PySqlite2Cursor) def __getattr__(self, attrname): return getattr(self._cnx, attrname) + cnx = sqlite.connect(database, detect_types=sqlite.PARSE_DECLTYPES) return self._wrap_if_needed(PySqlite2CnxWrapper(cnx), user) @@ -177,7 +177,7 @@ def install(**kwargs): try: if not USE_SETUPTOOLS: from distutils import __version__ as distutils_version - if distutils_version.split('.') <= (2, 5, 1): + if tuple([int(x) for x in distutils_version.split('.')]) <= (2, 5, 1): sys.argv.remove('--install-layout=deb') print "W: remove '--install-layout=deb' option" except: |