Adds unicode keyboard reading, blocks events after display.init

Author: spacether

CHANGELOG.md

@@ -2,6 +2,8 @@
 - Fixes bug where audio files could not be loaded because mixer.init was not
   allowing the data to be modified to suit the hardware needs
 - 1, 2, and 4 channel wave files now supported
+- Fixes bug where keyboard files were read as ascii instead of unicode
+- Fixes bug where blocked audio device events were showing up in the queues
 
 ## 2.0.0
 - Add qwerty keyboard layout and defaults to using it

Makefile

@@ -22,7 +22,6 @@ testpypi:
 	then \
 			echo "\nNot publishing"; exit 1; \
 	fi
-	make dist
 	python -m twine upload --repository testpypi dist/*
 
 pypi:
@@ -31,5 +30,4 @@ pypi:
 	then \
 			echo "\nNot publishing"; exit 1; \
 	fi
-	make dist
 	twine upload dist/*

pianoputer/pianoputer.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import argparse
+import codecs
 import pygame
 import warnings
 import librosa
@@ -136,7 +137,7 @@ def __get_black_key_indices(key_name: str) -> set:
     return black_key_indices
 
 def get_keyboard_info(keyboard_file: str):
-    with open(keyboard_file, 'r') as k_file:
+    with codecs.open(keyboard_file, encoding='utf-8') as k_file:
         lines = k_file.readlines()
     keys = []
     anchor_index = -1
@@ -206,6 +207,10 @@ def configure_pygame_audio_and_set_ui(
     pygame.display.init()
     pygame.display.set_caption('pianoputer')
 
+    # block events that we don't want, this must be after display.init
+    pygame.event.set_blocked(None)
+    pygame.event.set_allowed(list(ALLOWED_EVENTS))
+
     # fonts
     pygame.font.init()
 
@@ -216,10 +221,6 @@ def configure_pygame_audio_and_set_ui(
         allowedchanges=AUDIO_ALLOWED_CHANGES_HARDWARE_DETERMINED
     )
 
-    # block events that we don't want
-    pygame.event.set_blocked(None)
-    pygame.event.set_allowed(list(ALLOWED_EVENTS))
-
     screen_width = 50
     screen_height = 50
     if 'qwerty' in keyboard_arg: