From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 29 May 2013 22:49:27 +0000 (-0400)
Subject: Merge branch 'rel_0_9'
X-Git-Tag: rel_0_9_0b1~304^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bf77b1b0b18b6091c96e37823bcca87237d5482;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'rel_0_9'

Conflicts:
	lib/sqlalchemy/dialects/postgresql/hstore.py
	lib/sqlalchemy/util/__init__.py
	lib/sqlalchemy/util/compat.py
---

3bf77b1b0b18b6091c96e37823bcca87237d5482
diff --cc lib/sqlalchemy/util/compat.py
index 6905d6347c,182ab1c3d0..3bbce5ddeb
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@@ -14,9 -14,8 +14,8 @@@ except ImportError
      import dummy_threading as threading
  
  py32 = sys.version_info >= (3, 2)
- py3k_warning = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
  py3k = sys.version_info >= (3, 0)
 -py2k = not py3k
 +py2k = sys.version_info < (3, 0)
  jython = sys.platform.startswith('java')
  pypy = hasattr(sys, 'pypy_version_info')
  win32 = sys.platform.startswith('win')