merge tip

diff --cc CHANGES
index 5bbc0bb815c78cd6d2d26f80d58ecd9d626d7696,0bc7275b9611ea15c971faf10ead1b47dcaf0ab6..9bd30951019251104ce2124d237e09985a8414db
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -26,9 -33,12 +33,15 @@@ CHANGE
      be used.   This will impact decimal accuracy and some
      unicode handling issues.  [ticket:1775]
  
 +  - Fixed use_ansi=False mode, which was producing broken 
 +    WHERE clauses in pretty much all cases.  [ticket:1790]
 +    
+   - oracle_xe 5 doesn't accept a Python unicode object in 
+     its connect string in normal Python 2.x mode - so we coerce
+     to str() directly.  non-ascii characters aren't supported
+     in connect strings here since we don't know what encoding
+     we could use.  [ticket:1670]
+ 
  - firebird
    - Added a label to the query used within has_table() and 
      has_sequence() to work with older versions of Firebird

diff --cc test/engine/test_reconnect.py
index 6afd7151554f12939c25423368a3c37de84138d1,117ef05eeabb8fa76967e523c2500e1b360873fd..dddc445ac6dcaf5bde9de9d4c6a4da599abe903b
--- 1/test/engine/test_reconnect.py
--- 2/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@@ -54,8 -54,8 +54,9 @@@ class MockReconnectTest(TestBase)
          global db, dbapi
          dbapi = MockDBAPI()
  
--        # create engine using our current dburi
--        db = tsa.create_engine('postgresql://foo:bar@localhost/test', module=dbapi, _initialize=False)
++        db = tsa.create_engine(
++                    'postgresql://foo:bar@localhost/test', 
++                    module=dbapi, _initialize=False)
  
          # monkeypatch disconnect checker
          db.dialect.is_disconnect = lambda e: isinstance(e, MockDisconnect)
@@@ -177,6 -177,34 +178,38 @@@
          assert not conn.invalidated
          assert len(dbapi.connections) == 1
  
 -        # create engine using our current dburi
 -        db = tsa.create_engine('postgresql://foo:bar@localhost/test', module=dbapi, _initialize=False)
+ class CursorErrTest(TestBase):
+ 
+     def setup(self):
+         global db, dbapi
+         
+         class MDBAPI(MockDBAPI):
+             def connect(self, *args, **kwargs):
+                 return MConn(self)
+             
+         class MConn(MockConnection):
+             def cursor(self):
+                 return MCursor(self)
+ 
+         class MCursor(MockCursor):
+             def close(self):
+                 raise Exception("explode")
+ 
+         dbapi = MDBAPI()
+ 
++        db = tsa.create_engine(
++                    'postgresql://foo:bar@localhost/test', 
++                    module=dbapi, _initialize=False)
+     
+     def test_cursor_explode(self):
+         conn = db.connect()
+         result = conn.execute("select foo")
+         result.close()
+         conn.close()
++    
++    def teardown(self):
++        db.dispose()
+         
  engine = None
  class RealReconnectTest(TestBase):
      def setup(self):