Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PyDC/PyDC/CassetteObjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,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
Expand Down
2 changes: 0 additions & 2 deletions PyDC/PyDC/base_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 1 addition & 6 deletions PyDC/PyDC/bitstream_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,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
Expand Down
3 changes: 2 additions & 1 deletion PyDC/PyDC/wave2bitstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import logging
import math
import struct
import sys
import time
import wave

Expand Down Expand Up @@ -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):
Expand Down