Remove py2 compat mechanism from test suite

Author: mfussenegger

src/crate/client/doctests/client.txt

@@ -85,10 +85,10 @@ To bulk insert data you can use the ``executemany`` function::
     ... (name, date, kind, position) VALUES (?, ?, ?, ?)""",
     ...                [('Cloverleaf', '2007-03-11', 'Quasar', 7),
     ...                 ('Old Faithful', '2007-03-11', 'Quasar', 7)])
-    [{u'rowcount': 1}, {u'rowcount': 1}]
+    [{'rowcount': 1}, {'rowcount': 1}]
 
 ``executemany`` returns a list of results for every parameter. Each result
-contains a rowcount. If an error occures the rowcount is -2 and the result
+contains a rowcount. If an error occurs the rowcount is -2 and the result
 may contain an ``error_message`` depending on the error.
 
 Refresh locations:
@@ -112,7 +112,7 @@ fetchone()
 
     >>> result = cursor.fetchone()
     >>> pprint(result)
-    [u'Algol']
+    ['Algol']
 
 If no more data is available, an empty result is returned::
 
@@ -129,19 +129,19 @@ the specified size of rows::
     >>> cursor.execute("SELECT name FROM locations order by name")
     >>> result = cursor.fetchmany(2)
     >>> pprint(result)
-    [[u'Aldebaran'], [u'Algol']]
+    [['Aldebaran'], ['Algol']]
 
 If a size is not given, the cursor's arraysize, which defaults to '1',
 determines the number of rows to be fetched::
 
     >>> cursor.fetchmany()
-    [[u'Allosimanius Syneca']]
+    [['Allosimanius Syneca']]
 
 It's also possible to change the cursors arraysize to an other value::
 
     >>> cursor.arraysize = 3
     >>> cursor.fetchmany()
-    [[u'Alpha Centauri'], [u'Altair'], [u'Argabuthon']]
+    [['Alpha Centauri'], ['Altair'], ['Argabuthon']]
 
 fetchall()
 ----------
@@ -219,7 +219,7 @@ be raised.
     >>> cursor.execute("SELECT * FROM locations")
     Traceback (most recent call last):
     ...
-    ProgrammingError: Cursor closed
+    crate.client.exceptions.ProgrammingError: Cursor closed
 
 Closing the Connection
 ======================
@@ -235,9 +235,9 @@ operation using the connection is attempted to a closed connection an
     >>> cursor.execute("SELECT * FROM locations")
     Traceback (most recent call last):
     ...
-    ProgrammingError: Connection closed
+    crate.client.exceptions.ProgrammingError: Connection closed
 
     >>> cursor = connection.cursor()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Connection closed
+    crate.client.exceptions.ProgrammingError: Connection closed

src/crate/client/doctests/connection.txt

@@ -34,17 +34,17 @@ raise a ``ProgrammingError``::
     >>> cursor = connection.cursor()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Connection closed
+    crate.client.exceptions.ProgrammingError: Connection closed
 
     >>> cursor.execute('')
     Traceback (most recent call last):
     ...
-    ProgrammingError: Connection closed
+    crate.client.exceptions.ProgrammingError: Connection closed
 
     >>> connection.commit()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Connection closed
+    crate.client.exceptions.ProgrammingError: Connection closed
 
     >>> connection = connect(client=connection_client_mocked)
     >>> cursor = connection.cursor()

src/crate/client/doctests/cursor.txt

@@ -61,7 +61,7 @@ in an error::
     >>> new_cursor.fetchone()
     Traceback (most recent call last):
     ...
-    ProgrammingError: No result available. execute() or executemany() must be called first.
+    crate.client.exceptions.ProgrammingError: No result available. execute() or executemany() must be called first.
 
 
 fetchmany()
@@ -154,7 +154,7 @@ Iterating over a new cursor without results will immediately raise a Programming
     >>> next(new_cursor)
     Traceback (most recent call last):
     ...
-    ProgrammingError: No result available. execute() or executemany() must be called first.
+    crate.client.exceptions.ProgrammingError: No result available. execute() or executemany() must be called first.
 
 description
 ===========
@@ -296,20 +296,20 @@ closed connection an ``ProgrammingError`` exception will be raised::
     >>> cursor.fetchone()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Cursor closed
+    crate.client.exceptions.ProgrammingError: Cursor closed
 
     >>> cursor.fetchmany()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Cursor closed
+    crate.client.exceptions.ProgrammingError: Cursor closed
 
     >>> cursor.fetchall()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Cursor closed
+    crate.client.exceptions.ProgrammingError: Cursor closed
 
     >>> cursor.next()
     Traceback (most recent call last):
     ...
-    ProgrammingError: Cursor closed
+    crate.client.exceptions.ProgrammingError: Cursor closed
 

src/crate/client/doctests/http.txt

@@ -69,22 +69,22 @@ Issue a select statement against our with test data pre-filled crate instance::
     >>> http_client = HttpClient(crate_host)
     >>> result = http_client.sql('select name from locations order by name')
     >>> pprint(result)
-    {u'cols': [u'name'],
-     u'duration': ...,
-     u'rowcount': 13,
-     u'rows': [['Aldebaran'],
-                ['Algol'],
-                ['Allosimanius Syneca'],
-                ['Alpha Centauri'],
-                ['Altair'],
-                ['Argabuthon'],
-                ['Arkintoofle Minor'],
-                ['Bartledan'],
-                ['Folfanga'],
-                ['Galactic Sector QQ7 Active J Gamma'],
-                ['Galaxy'],
-                ['North West Ripple'],
-                ['Outer Eastern Rim']]}
+    {'cols': ['name'],
+     'duration': ...,
+     'rowcount': 13,
+     'rows': [['Aldebaran'],
+              ['Algol'],
+              ['Allosimanius Syneca'],
+              ['Alpha Centauri'],
+              ['Altair'],
+              ['Argabuthon'],
+              ['Arkintoofle Minor'],
+              ['Bartledan'],
+              ['Folfanga'],
+              ['Galactic Sector QQ7 Active J Gamma'],
+              ['Galaxy'],
+              ['North West Ripple'],
+              ['Outer Eastern Rim']]}
 
 Blobs
 =====
@@ -99,7 +99,7 @@ Trying to get a non-existing blob throws an exception::
     >>> http_client.blob_get('myfiles', '041f06fd774092478d450774f5ba30c5da78acc8')
     Traceback (most recent call last):
     ...
-    DigestNotFoundException: myfiles/041f06fd774092478d450774f5ba30c5da78acc8
+    crate.client.exceptions.DigestNotFoundException: myfiles/041f06fd774092478d450774f5ba30c5da78acc8
 
 Creating a new blob - this method returns True if the blob was newly
 created, false if it already exists::
@@ -153,7 +153,7 @@ Uploading a blob to a table with disabled blob support throws an exception::
     ...     'locations', '040f06fd774092478d450774f5ba30c5da78acc8', f)
     Traceback (most recent call last):
     ...
-    BlobLocationNotFoundException: locations/040f06fd774092478d450774f5ba30c5da78acc8
+    crate.client.exceptions.BlobLocationNotFoundException: locations/040f06fd774092478d450774f5ba30c5da78acc8
 
 Error Handling
 ==============
@@ -179,15 +179,15 @@ an exception is raised when the timeout is reached::
     >>> http_client.sql('select fib(32)')
     Traceback (most recent call last):
     ...
-    ConnectionError: No more Servers available, exception from last server: ...
+    crate.client.exceptions.ConnectionError: No more Servers available, exception from last server: ...
 
 When connecting to non Crate servers the HttpClient will raise a ConnectionError like this::
 
     >>> http_client = HttpClient(["https://crate.io"])
     >>> http_client.server_infos(http_client._get_server())
     Traceback (most recent call last):
     ...
-    ProgrammingError: Invalid server response of content-type 'text/html; charset=UTF-8':
+    crate.client.exceptions.ProgrammingError: Invalid server response of content-type 'text/html; charset=UTF-8':
     ...
 
 When using the ``error_trace`` kwarg a full traceback of the server exception

src/crate/client/doctests/https.txt

@@ -31,7 +31,7 @@ a self signed certificate::
 
     >>> http_client = HttpClient([crate_host])
     >>> http_client.server_infos(http_client._get_server())
-    ('https://localhost:65534', u'test', '0.0.0')
+    ('https://localhost:65534', 'test', '0.0.0')
 
 When switching on verification without a ``ca_cert`` file provided, the
 connection will fail::
@@ -40,28 +40,28 @@ connection will fail::
     >>> verifying_client.server_infos(crate_host)
     Traceback (most recent call last):
     ...
-    ConnectionError: Server not available, ...certificate verify failed...
+    crate.client.exceptions.ConnectionError: Server not available, ...certificate verify failed...
 
 Also when providing an invalid ``ca_cert`` an error is raised::
 
     >>> verifying_client = HttpClient([crate_host], ca_cert=invalid_ca_cert, verify_ssl_cert=True)
     >>> verifying_client.server_infos(crate_host)
     Traceback (most recent call last):
     ...
-    ConnectionError: Server not available, ...certificate verify failed...
+    crate.client.exceptions.ConnectionError: Server not available, ...certificate verify failed...
 
 Without verification, the given ``ca_cert`` is ignored and the connection will be
 established, to Eves satisfaction.
 
     >>> non_verifying_client = HttpClient([crate_host], ca_cert=invalid_ca_cert, verify_ssl_cert=False)
     >>> non_verifying_client.server_infos(crate_host)
-    ('https://localhost:65534', u'test', '0.0.0')
+    ('https://localhost:65534', 'test', '0.0.0')
 
 Connecting to a host whose certificate is verified with a valid CA certificate::
 
     >>> verifying_valid_client = HttpClient([crate_host], ca_cert=valid_ca_cert, verify_ssl_cert=True)
     >>> verifying_valid_client.server_infos(verifying_valid_client._get_server())
-    ('https://localhost:65534', u'test', '0.0.0')
+    ('https://localhost:65534', 'test', '0.0.0')
 
 
 Client Certificate
@@ -80,5 +80,5 @@ invalid::
     >>> client.server_infos(crate_host)
     Traceback (most recent call last):
     ...
-    ConnectionError: Server not available, exception: ...[SSL: ...
+    crate.client.exceptions.ConnectionError: Server not available, exception: ...[SSL: ...
 

src/crate/client/doctests/sqlalchemy.txt

@@ -135,10 +135,10 @@ be left untouched.
     >>> session.refresh(char)
 
     >>> char.details['gender']
-    u'manly man'
+    'manly man'
 
     >>> char.details['species']
-    u'human'
+    'human'
 
 Object Array
 ------------
@@ -173,7 +173,7 @@ to be returned::
     >>> from sqlalchemy.sql import operators
     >>> query = session.query(Character.name)
     >>> query.filter(Character.more_details['foo'].any(1, operator=operators.eq)).all()
-    [(u'Arthur Dent',)]
+    [('Arthur Dent',)]
 
 Querying a field of an object array will result in an array of
 all values of that field of all objects in that object array::
@@ -208,7 +208,7 @@ Using the ``group_by`` clause is similar::
     ...     .group_by(Character.name) \
     ...     .order_by(sa.desc(sa.func.count(Character.id))) \
     ...     .order_by(Character.name).all()
-    [(1, u'Arthur Dent'), (1, u'Tricia McMillan')]
+    [(1, 'Arthur Dent'), (1, 'Tricia McMillan')]
 
 Fulltext Search with MATCH Predicate
 ====================================
@@ -260,7 +260,7 @@ The default match_type is best_fields::
     ...                 options={'fuzziness': 3})
     ...     ) \
     ...     .all()
-    [(u'Arthur Dent',)]
+    [('Arthur Dent',)]
 
 It's not possible to specify options without the match_type argument::
 
@@ -376,4 +376,4 @@ This will result in the following query::
     ... "(SELECT todos.id, todos.content FROM todos WHERE todos.status = 'done')"
 
     >>> pprint([str(r) for r in session.execute("Select content from archived_tasks")])
-    ["(u'Write Tests',)"]
+    ["('Write Tests',)"]

src/crate/client/sqlalchemy/doctests/itests.txt

@@ -11,7 +11,7 @@ Using the connection to execute a select statement::
     13
 
     >>> result.first()
-    (u'Aldebaran',)
+    ('Aldebaran',)
 
 Using the ORM to query the locations::
 
@@ -29,14 +29,14 @@ With filter::
 
     >>> location = session.query(Location).filter_by(name='Algol').one()
     >>> location.name
-    u'Algol'
+    'Algol'
 
 Order by::
 
     >>> locations = session.query(Location).filter(Location.name != None).order_by(sa.desc(Location.name))
     >>> locations = locations.limit(2)
     >>> [l.name for l in locations]
-    [u'Outer Eastern Rim', u'North West Ripple']
+    ['Outer Eastern Rim', 'North West Ripple']
 
 
 Insert a new location::
@@ -58,13 +58,13 @@ Inserted location is available::
 
     >>> location = session.query(Location).filter_by(name='Earth').one()
     >>> location.name
-    u'Earth'
+    'Earth'
 
 Retrieve the location from the database::
 
     >>> session.refresh(location)
     >>> location.name
-    u'Earth'
+    'Earth'
 
 Date should have been set at the insert due to default value via python method::
 
@@ -87,10 +87,10 @@ Date should have been set at the insert due to default value via python method::
 Verify the return type of date and datetime::
 
     >>> type(location.date)
-    <type 'datetime.date'>
+    <class 'datetime.date'>
 
     >>> type(location.datetime)
-    <type 'datetime.datetime'>
+    <class 'datetime.datetime'>
 
 the location also has a date and datetime property which both are nullable and
 aren't set when the row is inserted as there is no default method::
@@ -165,7 +165,7 @@ Test that objects can be used as list too::
     >>> session.refresh(location)
 
     >>> location.details
-    [{u'size': u'huge'}, {u'clima': u'cold'}]
+    [{'size': 'huge'}, {'clima': 'cold'}]
 
 Update the clima::
 
@@ -175,7 +175,7 @@ Update the clima::
     >>> session.refresh(location)
 
     >>> location.details
-    [{u'size': u'huge'}, {u'clima': u'hot'}]
+    [{'size': 'huge'}, {'clima': 'hot'}]
 
 Reset the clima::