Merge pull request cossacklabs#67 from Lagovas/lagovas/update-python-…

…examples fix examples when print data without decrypting
modulexcite · Feb 11, 2017 · 9cf3d73 · 9cf3d73
2 parents 14b5249 + 19eaf54
commit 9cf3d73
Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/examples/python/save_with_zone.py b/examples/python/save_with_zone.py
@@ -64,12 +64,16 @@ def get_zone():
     proxy_connection = proxy_engine.connect()
     metadata.create_all(proxy_engine)
 
-    if getattr(args, 'print', False) and args.zone_id:
-        print("use zone_id: ", args.zone_id)
-        result = proxy_connection.execute(
-            select([cast(args.zone_id.encode('utf-8'), BYTEA), test]))
+    if getattr(args, 'print', False):
+        if args.zone_id:
+            print("use zone_id: ", args.zone_id)
+            result = proxy_connection.execute(
+                select([cast(args.zone_id.encode('utf-8'), BYTEA), test]))
+        else:
+            result = proxy_connection.execute(
+                select([cast('without zone'.encode('utf-8'), BYTEA), test]))
         result = result.fetchall()
-        print("{:<3} - {:<20} - {}".format("id", "data", "raw_data"))
+        print("{:<3} - {} - {} - {:>10}".format("id", 'zone', "data", "raw_data"))
         for row in result:
             try:
                 print("{:<3} - {} - {} - {:>10}\n".format(row['id'], row[0], row['data'].decode('utf-8'), row['raw_data']))

diff --git a/examples/python/save_without_zone.py b/examples/python/save_without_zone.py
@@ -66,7 +66,7 @@ def process_result_value(self, value, dialect):
         key = f.read()
     test = Table('test_example_without_zone', metadata,
         Column('id', Integer, primary_key=True),
-        Column('data', AcraString(key)),
+        Column('data', AcraBinary(key)),
         Column('raw_data', String),
     )