make python3 compatible

__init__.py

@@ -3,8 +3,7 @@
 import sys
 from os.path import dirname
 
-if sys.version_info.major == 2:
-    sys.path.insert(0, "%s\\venv\\Lib\\site-packages" % dirname(os.path.realpath(__file__)))
+sys.path.insert(0, "%s\\venv\\Lib\\site-packages" % dirname(os.path.realpath(__file__)))
 
 live_environment_loaded = "Live" in sys.modules
 

application/Container.py

@@ -11,7 +11,6 @@
 from protocol0.domain.audit.AudioLatencyAnalyzerService import AudioLatencyAnalyzerService
 from protocol0.domain.audit.LogService import LogService
 from protocol0.domain.audit.SetFixerService import SetFixerService
-from protocol0.domain.audit.SetProfilingService import SetProfilingService
 from protocol0.domain.audit.SetUpgradeService import SetUpgradeService
 from protocol0.domain.audit.SongStatsService import SongStatsService
 from protocol0.domain.lom.device.DeviceDisplayService import DeviceDisplayService
@@ -186,7 +185,6 @@ def __init__(self, control_surface):
         )
         log_service = LogService(ableton_set, track_mapper_service, matching_track_service)
 
-        set_profiling_service = SetProfilingService()
         song_stats_service = SongStatsService()
 
         self._register(midi_service)
@@ -229,7 +227,6 @@ def __init__(self, control_surface):
         self._register(log_service)
         self._register(set_upgrade_service)
         self._register(set_fixer_service)
-        self._register(set_profiling_service)
         self._register(song_stats_service)
 
         self._register(session_to_arrangement_service)

application/control_surface/group/ActionGroupTest.py

@@ -2,9 +2,9 @@
 
 from protocol0.application.control_surface.ActionGroupInterface import ActionGroupInterface
 from protocol0.domain.audit.AudioLatencyAnalyzerService import AudioLatencyAnalyzerService
-from protocol0.domain.audit.SetProfilingService import SetProfilingService
 from protocol0.domain.lom.clip.AudioClip import AudioClip
 from protocol0.domain.lom.track.simple_track.audio.SimpleAudioTrack import SimpleAudioTrack
+from protocol0.domain.shared.backend.Backend import Backend
 from protocol0.shared.Song import Song
 from protocol0.shared.logging.Logger import Logger
 
@@ -25,7 +25,7 @@ def configure(self):
         self.add_encoder(
             identifier=2,
             name="start set launch time profiling",
-            on_press=self._container.get(SetProfilingService).profile_set,
+            on_press=Backend.client().start_set_profiling,
         )
 
         # CLR encoder
@@ -56,4 +56,4 @@ def action_log_midi(self):
     def action_test(self):
         # type: () -> None
         from protocol0.shared.logging.Logger import Logger
-        Logger.dev(Song.selected_clip())
+        Logger.dev("toto")

application/error/SentryService.py

@@ -1,4 +1,3 @@
-import sentry_sdk
 from typing import Dict, Any
 
 from protocol0.shared.Config import Config
@@ -9,11 +8,13 @@ class SentryService(object):
     def __init__(self):
         # type: () -> None
         self.activated = False
-        self.sdk = sentry_sdk
 
     def activate(self):
         # type: () -> None
-        self.sdk.init(
+        # noinspection PyUnresolvedReferences
+        import sentry_sdk
+
+        sentry_sdk.init(
             dsn=Config.SENTRY_DSN,
             before_send=self._before_send,
             # Set traces_sample_rate to 1.0 to capture 100%

domain/audit/stats/Stats.py

@@ -1,4 +1,5 @@
-from typing import Dict, Protocol
+from typing_extensions import Protocol
+from typing import Dict
 
 
 class Stats(Protocol):

domain/lom/song/SongInitService.py

@@ -24,9 +24,10 @@ def init_song(self):
         CommandBus.dispatch(ResetPlaybackCommand())
 
         DomainEventBus.emit(SongInitializedEvent())
-        ApplicationView.show_session()
         seq = Sequence()
-        seq.wait(10)
+        seq.wait(2)
+        seq.add(ApplicationView.show_session)
+        seq.wait(8)
 
         if not self._ableton_set.is_unknown and not self._ableton_set.is_test:
             seq.add(self._check_sound_id_device)

domain/lom/track/P0TrackInterface.py

@@ -1,5 +1,5 @@
 import Live
-from typing import Protocol
+from typing_extensions import Protocol
 
 
 class P0TrackInterface(Protocol):

domain/lom/track/simple_track/SimpleTrackClips.py

@@ -1,6 +1,4 @@
-from collections import Iterator
-
-from typing import List, TYPE_CHECKING
+from typing import List, TYPE_CHECKING, Iterator
 
 from protocol0.domain.lom.clip.Clip import Clip
 from protocol0.domain.lom.track.simple_track.SimpleTrackClipColorManager import \

domain/shared/LiveObject.py

@@ -1,4 +1,5 @@
-from typing import Protocol, Any
+from typing_extensions import Protocol
+from typing import Any
 
 
 def liveobj_valid(obj):

domain/shared/event/HasEmitter.py

@@ -1,4 +1,4 @@
-from typing import Protocol, runtime_checkable
+from typing_extensions import Protocol, runtime_checkable
 
 
 @runtime_checkable

domain/shared/utils/string.py

@@ -10,6 +10,7 @@ def smart_string(s):
 
     if not isinstance(s, basestring):
         s = str(s)
+
     try:
         return s.decode("utf-8").encode("ascii", "ignore")
     except UnicodeEncodeError:

infra/logging/LoggerService.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import sys
 import types
 
 from typing import Optional, Any, List, Dict
@@ -27,7 +28,7 @@ def log(self, message, debug=True, level=None):
 
                 Logger.warning(e)
 
-        if not isinstance(message, basestring):
+        if sys.version_info.major == 2 and not isinstance(message, basestring):
             message = str(message)
 
         level = level or LogLevelEnum.INFO
@@ -48,5 +49,8 @@ def log(self, message, debug=True, level=None):
                     frame_info.method_name,
                 )
         for line in message.splitlines():
-            line = "P0 - %s" % line.decode("utf-8").encode("ascii", "replace")
+            if sys.version_info.major == 2:
+                line.decode("utf-8").encode("ascii", "replace")
+
+            line = "P0 - %s" % line
             logging.info(line)

shared/Song.py

@@ -1,5 +1,5 @@
 import traceback
-from collections import Iterator
+from typing import Iterator
 
 import Live
 from typing import TYPE_CHECKING, Optional, List, cast, Type

shared/logging/StatusBar.py

@@ -1,4 +1,4 @@
-from collections import Callable
+from typing import Callable
 
 from typing import Optional
 

shared/observer/Observer.py

@@ -1,4 +1,4 @@
-from typing import Protocol, TYPE_CHECKING
+from typing_extensions import Protocol, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from protocol0.shared.observer.Observable import Observable

shared/sequence/HasSequenceState.py

@@ -1,4 +1,5 @@
-from typing import Protocol, runtime_checkable, Any
+from typing_extensions import Protocol, runtime_checkable
+from typing import Any
 
 from protocol0.shared.observer.Observer import Observer
 from protocol0.shared.sequence.SequenceState import SequenceState