From 38b790e37fe4797e45b6cb7802ec76a7e0cbd79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Thu, 19 Jan 2023 23:48:23 +0200
Subject: [PATCH] Make PyDC work properly under Python 3

---
 PyDC/PyDC/CassetteObjects.py   | 2 +-
 PyDC/PyDC/base_cli.py          | 2 --
 PyDC/PyDC/bitstream_handler.py | 7 +------
 PyDC/PyDC/wave2bitstream.py    | 3 ++-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/PyDC/PyDC/CassetteObjects.py b/PyDC/PyDC/CassetteObjects.py
index 6a4ed80..fcfea55 100644
--- a/PyDC/PyDC/CassetteObjects.py
+++ b/PyDC/PyDC/CassetteObjects.py
@@ -656,7 +656,7 @@ def write_cas(self, destination_file):
 
         def _write(f, codepoint):
             try:
-                f.write(chr(codepoint))
+                f.write(bytes([codepoint]))
             except ValueError as err:
                 log.error(f"Value error with {repr(codepoint)}: {err}")
                 raise
diff --git a/PyDC/PyDC/base_cli.py b/PyDC/PyDC/base_cli.py
index 3e8628f..7ce4354 100644
--- a/PyDC/PyDC/base_cli.py
+++ b/PyDC/PyDC/base_cli.py
@@ -39,8 +39,6 @@ def __init__(self):
             arg_kwargs["description"] = self.DESCRIPTION
         if self.EPOLOG is not None:
             arg_kwargs["epilog"] = self.EPOLOG
-        if self.VERSION is not None:
-            arg_kwargs["version"] = self.VERSION
 
         self.parser = argparse.ArgumentParser(**arg_kwargs)
 
diff --git a/PyDC/PyDC/bitstream_handler.py b/PyDC/PyDC/bitstream_handler.py
index f12cb29..3f5b60a 100755
--- a/PyDC/PyDC/bitstream_handler.py
+++ b/PyDC/PyDC/bitstream_handler.py
@@ -259,17 +259,12 @@ def __init__(self, source_filepath):
         self.pos = 0
         self.file_generator = self.__file_generator()
 
-        self.yield_ord = True
-
     def __iter__(self):
         return self
 
     def __next__(self):
         byte = next(self.file_generator)
-        if self.yield_ord:
-            return ord(byte)
-        else:
-            return byte
+        return byte
 
     def __file_generator(self):
         max = self.file_size + 1
diff --git a/PyDC/PyDC/wave2bitstream.py b/PyDC/PyDC/wave2bitstream.py
index 4c3028a..7428760 100644
--- a/PyDC/PyDC/wave2bitstream.py
+++ b/PyDC/PyDC/wave2bitstream.py
@@ -11,6 +11,7 @@
 import logging
 import math
 import struct
+import sys
 import time
 import wave
 
@@ -158,7 +159,7 @@ def _print_status(self, process_info):
         percent = float(self.wave_pos) / self.frame_count * 100
         rest, eta, rate = process_info.update(self.wave_pos)
         sys.stdout.write(
-            f"\r{percent:.1f}% wav pos:{self.pformat_pos()} - eta: {eta} (rate: {rate:d}Frames/sec)       ")
+            f"\r{percent:.1f}% wav pos:{self.pformat_pos()} - eta: {eta} (rate: {int(rate)}Frames/sec)       ")
         sys.stdout.flush()
 
     def _get_statistics(self, max=None):