merge default

diff --cc test/engine/test_pool.py
index 1d31c16b5d5b484895f1487ae87b84c05011afd0,9551086f5dbff50cfea30812d1d54d9d64d447d1..260f461d00ab8c3ac2b73347484ba68c8a95f762
--- 1/test/engine/test_pool.py
--- 2/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 8d76f74f95e9da7e975f9b826e58a4dacb83f51e,79514eaf405beb7f4bc94710719b3dc23c3f0a8b..1508c0532b146f10f0081622cde9ff2ef28a6646
--- 1/test/sql/test_defaults.py
--- 2/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