Add isort pre-commit hook

Sort import statement in python files

See https://github.com/PyCQA/isort

python_apps/pypo/bin/pyponotify

@@ -17,18 +17,18 @@ Main case:
 
 """
 
-from optparse import OptionParser
-import sys
-import logging.config
 import json
-
-# additional modules (should be checked)
-from configobj import ConfigObj
+import logging.config
+import sys
+from optparse import OptionParser
 
 # custom imports
 # from util import *
 from api_clients import version1 as api_client
 
+# additional modules (should be checked)
+from configobj import ConfigObj
+
 LOG_LEVEL = logging.INFO
 LOG_PATH = "/var/log/airtime/pypo/notify.log"
 

python_apps/pypo/liquidsoap/__main__.py

@@ -1,12 +1,14 @@
 """ Runs Airtime liquidsoap
 """
 import argparse
-import os
-from . import generate_liquidsoap_cfg
 import logging
+import os
 import subprocess
+
 from pypo import pure
 
+from . import generate_liquidsoap_cfg
+
 PYPO_HOME = "/var/tmp/airtime/pypo/"
 
 

python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py

@@ -3,6 +3,7 @@ import os
 import sys
 import time
 import traceback
+
 from api_clients.version1 import AirtimeApiClient
 
 

python_apps/pypo/liquidsoap/liquidsoap_auth.py

@@ -1,6 +1,7 @@
-from api_clients import version1 as api_client
 import sys
 
+from api_clients import version1 as api_client
+
 api_clients = api_client.AirtimeApiClient()
 
 dj_type = sys.argv[1]

python_apps/pypo/liquidsoap/liquidsoap_prepare_terminate.py

@@ -1,6 +1,7 @@
-from configobj import ConfigObj
-import telnetlib
 import sys
+import telnetlib
+
+from configobj import ConfigObj
 
 try:
     config = ConfigObj("/etc/airtime/airtime.conf")

python_apps/pypo/pypo/__main__.py

@@ -3,6 +3,7 @@ Python part of radio playout (pypo)
 """
 
 
+import importlib
 import locale
 import logging
 import os
@@ -11,19 +12,20 @@ import signal
 import sys
 import telnetlib
 import time
+from datetime import datetime
+from optparse import OptionParser
 
 from api_clients import version1 as api_client
 from configobj import ConfigObj
-from datetime import datetime
-from optparse import OptionParser
-import importlib
 
 try:
     from queue import Queue
 except ImportError:  # Python 2.7.5 (CentOS 7)
     from queue import Queue
+
 from threading import Lock
 
+from . import pure
 from .listenerstat import ListenerStat
 from .pypofetch import PypoFetch
 from .pypofile import PypoFile
@@ -32,8 +34,6 @@ from .pypomessagehandler import PypoMessageHandler
 from .pypopush import PypoPush
 from .recorder import Recorder
 from .timeout import ls_timeout
-from . import pure
-
 
 LOG_PATH = "/var/log/airtime/pypo/pypo.log"
 LOG_LEVEL = logging.INFO

python_apps/pypo/pypo/listenerstat.py

@@ -1,12 +1,14 @@
-from threading import Thread
-import urllib.request, urllib.error, urllib.parse
-import defusedxml.minidom
 import base64
-from datetime import datetime
-import traceback
 import logging
 import time
+import traceback
+import urllib.error
+import urllib.parse
+import urllib.request
+from datetime import datetime
+from threading import Thread
 
+import defusedxml.minidom
 from api_clients import version1 as api_client
 
 

python_apps/pypo/pypo/pure.py

@@ -1,4 +1,5 @@
 import re
+
 from packaging.version import Version, parse
 
 

python_apps/pypo/pypo/pypofetch.py

@@ -1,21 +1,22 @@
-import os
-import sys
-import time
-import logging.config
-import json
-import telnetlib
 import copy
-import subprocess
-import signal
-from datetime import datetime
+import json
+import logging.config
 import mimetypes
-from . import pure
+import os
+import signal
+import subprocess
+import sys
+import telnetlib
+import time
+from datetime import datetime
 from queue import Empty
+from subprocess import PIPE, Popen
 from threading import Thread, Timer
-from subprocess import Popen, PIPE
 
 from api_clients import version1 as v1_api_client
 from api_clients import version2 as api_client
+
+from . import pure
 from .timeout import ls_timeout
 
 

python_apps/pypo/pypo/pypofile.py

@@ -1,20 +1,20 @@
-from threading import Thread
-from queue import Empty
-from configparser import NoOptionError
-
+import configparser
+import hashlib
+import json
 import logging
+import os
 import shutil
+import stat
+import sys
 import time
 import traceback
-import os
-import sys
-import stat
+from configparser import NoOptionError
+from queue import Empty
+from threading import Thread
+
 import requests
-import configparser
-import json
-import hashlib
-from requests.exceptions import ConnectionError, HTTPError, Timeout
 from api_clients import version2 as api_client
+from requests.exceptions import ConnectionError, HTTPError, Timeout
 
 CONFIG_PATH = "/etc/airtime/airtime.conf"
 

python_apps/pypo/pypo/pypoliqqueue.py

@@ -1,15 +1,11 @@
-from threading import Thread
-from collections import deque
-from datetime import datetime
-
-import traceback
+import signal
 import sys
 import time
-
-
+import traceback
+from collections import deque
+from datetime import datetime
 from queue import Empty
-
-import signal
+from threading import Thread
 
 
 def keyboardInterruptHandler(signum, frame):

python_apps/pypo/pypo/pypoliquidsoap.py

@@ -1,11 +1,9 @@
-from .pypofetch import PypoFetch
-from .telnetliquidsoap import TelnetLiquidsoap
-
-from datetime import datetime
-from datetime import timedelta
+import time
+from datetime import datetime, timedelta
 
 from . import eventtypes
-import time
+from .pypofetch import PypoFetch
+from .telnetliquidsoap import TelnetLiquidsoap
 
 
 class PypoLiquidsoap:

python_apps/pypo/pypo/pypomessagehandler.py

@@ -1,18 +1,18 @@
+import json
 import logging
-import traceback
 import os
 import sys
-from threading import Thread
 import time
+import traceback
+from threading import Thread
+
+from amqp.exceptions import AMQPError
 
 # For RabbitMQ
 from kombu.connection import Connection
 from kombu.messaging import Exchange, Queue
-from kombu.simple import SimpleQueue
-from amqp.exceptions import AMQPError
-import json
-
 from kombu.mixins import ConsumerMixin
+from kombu.simple import SimpleQueue
 
 logging.captureWarnings(True)
 

python_apps/pypo/pypo/pypopush.py

@@ -1,24 +1,20 @@
-from datetime import datetime
-from datetime import timedelta
-from configobj import ConfigObj
-
-import sys
-import time
-import logging.config
-import telnetlib
 import calendar
+import logging.config
 import math
-import traceback
 import os
-
-from .pypofetch import PypoFetch
-from .pypoliqqueue import PypoLiqQueue
-
+import sys
+import telnetlib
+import time
+import traceback
+from datetime import datetime, timedelta
 from queue import Empty, Queue
-
 from threading import Thread
 
 from api_clients import version1 as api_client
+from configobj import ConfigObj
+
+from .pypofetch import PypoFetch
+from .pypoliqqueue import PypoLiqQueue
 from .timeout import ls_timeout
 
 logging.captureWarnings(True)

python_apps/pypo/pypo/recorder.py

@@ -1,25 +1,21 @@
-import logging
-import json
-import time
 import datetime
-import os
-import sys
-import pytz
-import signal
+import json
+import logging
 import math
-import traceback
+import os
 import re
-
-from configobj import ConfigObj
-
-from subprocess import Popen
-from subprocess import PIPE
+import signal
+import sys
+import time
+import traceback
+from subprocess import PIPE, Popen
 from threading import Thread
 
 import mutagen
-
+import pytz
 from api_clients import version1 as v1_api_client
 from api_clients import version2 as api_client
+from configobj import ConfigObj
 
 
 def api_client(logger):

python_apps/pypo/pypo/telnetliquidsoap.py

@@ -1,7 +1,8 @@
 import telnetlib
-from .timeout import ls_timeout
 import traceback
 
+from .timeout import ls_timeout
+
 
 def create_liquidsoap_annotation(media):
     # We need liq_start_next value in the annotate. That is the value that controls overlap duration of crossfade.

python_apps/pypo/pypo/testpypoliqqueue.py

@@ -1,15 +1,12 @@
-from .pypoliqqueue import PypoLiqQueue
-from .telnetliquidsoap import DummyTelnetLiquidsoap, TelnetLiquidsoap
-
-
+import logging
+import signal
+import sys
+from datetime import datetime, timedelta
 from queue import Queue
 from threading import Lock
 
-import sys
-import signal
-import logging
-from datetime import datetime
-from datetime import timedelta
+from .pypoliqqueue import PypoLiqQueue
+from .telnetliquidsoap import DummyTelnetLiquidsoap, TelnetLiquidsoap
 
 
 def keyboardInterruptHandler(signum, frame):

python_apps/pypo/pypo/timeout.py

@@ -1,4 +1,5 @@
 import threading
+
 from . import pypofetch
 
 

python_apps/pypo/setup.py

@@ -1,8 +1,10 @@
 from __future__ import print_function
-from setuptools import setup
-from subprocess import call
-import sys
+
 import os
+import sys
+from subprocess import call
+
+from setuptools import setup
 
 script_path = os.path.dirname(os.path.realpath(__file__))
 print(script_path)