Changeset 40 for trunk/bin/bletchley-decode

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-decode (modified) (2 diffs)

trunk/bin/bletchley-decode

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Requires Python 2.7+
+# Requires Python 3+
 
 '''
@@ -45 +45 @@
     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')
 
-blob = input_file.read()
+blob = input_file.read().rstrip(b'\r\n')
 
 specified_encodings = options.encoding_chain.split(',')
-sys.stdout.write(blobtools.decodeChain(specified_encodings, blob))
+sys.stdout.buffer.write(blobtools.decodeChain(specified_encodings, blob))