Commit 4db10124 authored by Marek Vrbka's avatar Marek Vrbka
Browse files

Moar type fixes

parent 5ad27676
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
import io
import subprocess
from typing import Optional, List, Tuple
from typing import Optional, List, Tuple, BinaryIO

from pyocd.core.helpers import ConnectHelper
from pyocd.core.session import Session
@@ -10,7 +9,6 @@ import repository
from dotenv import load_dotenv
import os
import shutil
from subprocess import call
import logging
import re

@@ -42,7 +40,7 @@ class EnvironmentVariableNotSet(BaseException):
    pass


def copy_replacements(filepath: str, generated_replacements: List[(str, str)]):
def copy_replacements(filepath: str, generated_replacements: List[Tuple[str, str]]):
    for path, file_string in generated_replacements:
        with open(f'{filepath}/{path}', 'w') as file:
            file.write(file_string)
@@ -109,7 +107,7 @@ def get_emtest_folder():
    return os.getenv("EMTEST_FOLDER")


def handle_session(gen_replacements: List[Tuple[str, str]], to_delete: List[str]) -> Tuple[Session, io.BytesIO]:
def handle_session(gen_replacements: List[Tuple[str, str]], to_delete: List[str]) -> Tuple[Session, BinaryIO]:
    repo_folder = get_repository_folder()
    folder_name = prepare_build_files(gen_replacements, to_delete)
    build_binary(repo_folder, folder_name)
@@ -122,7 +120,7 @@ def handle_session(gen_replacements: List[Tuple[str, str]], to_delete: List[str]
    return session, open(f'{repo_folder}/{folder_name}/debug/StudentTest.elf', 'rb')


def load_and_open_session(gen_replacements=None, to_delete=None) -> Tuple[Session, io.BytesIO]:
def load_and_open_session(gen_replacements=None, to_delete=None) -> Tuple[Session, BinaryIO]:
    if gen_replacements is None:
        gen_replacements = []
    if to_delete is None: