Changeset 40 for trunk/bin/bletchley-analyze

Timestamp:

03/17/13 22:26:27 (11 years ago)

Author:

tmorgan

Message:

Switched to python3 only, since supporting both 2.x and 3.x is such a pain

Added preliminary python-requests support to http2py

File:

• trunk/bin/bletchley-analyze (modified) (5 diffs)

trunk/bin/bletchley-analyze

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Requires Python 2.7+
+# Requires Python 3+
 
 '''
@@ -54 +54 @@
     sys.exit(0)
 
-input_file = sys.stdin
+input_file = sys.stdin.buffer
 if options.input_file is not None:
-    input_file = file(options.input_file, 'rb')
+    input_file = open(options.input_file, 'rb')
 
-blobs = input_file.read().rstrip('\n').replace('\r', '').split('\n')
+blobs = input_file.read().rstrip(b'\n').replace(b'\r', b'').split(b'\n')
 #print(repr(blobs))
 
@@ -81 +81 @@
     line_size = 64
     group_size *= 2 # two hex digits per byte
-    hex_blobs = map(binascii.b2a_hex, blobs)
+    hex_blobs = [binascii.b2a_hex(b) for b in blobs]
     color_map = buffertools.blockWiseColorMap(group_size, hex_blobs)
 
     for k in range(0,len(hex_blobs)):
-        hex = hex_blobs[k]
+        hex = hex_blobs[k].decode()
         
         for i in range(0,len(hex),line_size):
@@ -98 +98 @@
        
             line += '| '
-            line += repr(blobs[k][i/2:(i+line_size)/2])
+            line += repr(blobs[k][i//2:(i+line_size)//2])
         
             print(line)
@@ -136 +136 @@
         encoding = specified_encodings.pop(0)
 
-
     blobs_to_print = blobs[:options.output_lines]
     print('First %d Values:' % len(blobs_to_print))