From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 5 May 2013 05:42:26 +0000 (-0400)
Subject: merge default
X-Git-Tag: rel_0_9_0b1~304^2~13^2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cca97433c1a5b6081f6fed35a339ddb74d95f8fd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge default
---

cca97433c1a5b6081f6fed35a339ddb74d95f8fd
diff --cc test/engine/test_pool.py
index 1d31c16b5d,9551086f5d..260f461d00
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@@ -807,12 -809,12 +809,12 @@@ class QueuePoolTest(PoolTestBase)
          # them back to the start of do_get()
          dbapi = MockDBAPI()
          p = pool.QueuePool(
-                 creator = lambda: dbapi.connect(delay=.05),
-                 pool_size = 2,
-                 max_overflow = 1, use_threadlocal = False, timeout=3)
+                 creator=lambda: dbapi.connect(delay=.05),
+                 pool_size=2,
+                 max_overflow=1, use_threadlocal=False, timeout=3)
          timeouts = []
          def checkout():
 -            for x in xrange(1):
 +            for x in range(1):
                  now = time.time()
                  try:
                      c1 = p.connect()
diff --cc test/sql/test_defaults.py
index 8d76f74f95,79514eaf40..1508c0532b
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@@ -11,11 -11,9 +11,13 @@@ from sqlalchemy.types import TypeDecora
  from sqlalchemy.testing.schema import Table, Column
  from sqlalchemy.dialects import sqlite
  from sqlalchemy.testing import fixtures
 +from sqlalchemy.util import u, b
 +from sqlalchemy import util
 +
 +t = f = f2 = ts = currenttime = metadata = default_generator = None
  
+ t = f = f2 = ts = currenttime = metadata = default_generator = None
+ 
  class DefaultTest(fixtures.TestBase):
  
      @classmethod