Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-04-06 06:53:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

change from python to python3

Browse source
This commit is contained in:
Julian Wöhrer 2022-01-01 23:02:47 +01:00
parent 5ebbaba6f1
commit d3da277d4f
15 changed files with 75 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
includes/alarmHandler.py
View file

@ -74,7 +74,7 @@ def processAlarm(typ, freq, data):
# timestamp, to make sure, that all plugins use the same time
data['timestamp'] = int(time.time())
# Go to all plugins in pluginList
for pluginName, plugin in globalVars.pluginList.items():
for pluginName, plugin in list(globalVars.pluginList.items()):
# if enabled use RegEx-filter
if globalVars.config.getint("BOSWatch","useRegExFilter"):
from includes import regexFilter

4
includes/helper/stringConverter.py
View file

@ -69,7 +69,7 @@ def convertToUnicode(inputString = ""):
pass
# 2. Check if inputString is unicode...
if isinstance(inputString, unicode):
if isinstance(inputString, str):
logging.debug("-- unicode")
return inputString
@ -112,7 +112,7 @@ def convertToUTF8(inputString = ""):
pass
# 2. Check if inputString is unicode...
if isinstance(inputString, unicode):
if isinstance(inputString, str):
logging.debug("-- unicode")
# ... then return it as UTF-8
uft8String = decodedString.encode('UTF-8')

2
includes/pluginLoader.py
View file

@ -13,7 +13,7 @@ import logging # Global logger
import imp
import os
from ConfigParser import NoOptionError # we need this exception
from configparser import NoOptionError # we need this exception
from includes import globalVars # Global variables
def loadPlugins():

52
includes/shellHeader.py
View file

@ -22,40 +22,40 @@ def printHeader(args):
@return: nothing
"""
try:
print " ____ ____ ______ __ __ __ "
print " / __ )/ __ \/ ___/ | / /___ _/ /______/ /_ "
print " / __ / / / /\__ \| | /| / / __ `/ __/ ___/ __ \ "
print " / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / / "
print " /_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/ "
print " German BOS Information Script "
print " by Bastian Schroll, Jens Herrmann "
print ""
print "SW Version: "+globalVars.versionNr
print "Branch: "+globalVars.branch
print "Build Date: "+globalVars.buildDate
print ""
print(" ____ ____ ______ __ __ __ ")
print(" / __ )/ __ \/ ___/ | / /___ _/ /______/ /_ ")
print(" / __ / / / /\__ \| | /| / / __ `/ __/ ___/ __ \ ")
print(" / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / / ")
print(" /_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/ ")
print(" German BOS Information Script ")
print(" by Bastian Schroll, Jens Herrmann ")
print("")
print(("SW Version: "+globalVars.versionNr))
print(("Branch: "+globalVars.branch))
print(("Build Date: "+globalVars.buildDate))
print("")
print "Frequency: "+args.freq
print "Device-ID: "+str(args.device)
print "Error in PPM: "+str(args.error)
print "Active Demods: "+str(len(args.demod))
print(("Frequency: "+args.freq))
print(("Device-ID: "+str(args.device)))
print(("Error in PPM: "+str(args.error)))
print(("Active Demods: "+str(len(args.demod))))
if "FMS" in args.demod:
print "- FMS"
print("- FMS")
if "ZVEI" in args.demod:
print "- ZVEI"
print("- ZVEI")
if "POC512" in args.demod:
print "- POC512"
print("- POC512")
if "POC1200" in args.demod:
print "- POC1200"
print("- POC1200")
if "POC2400" in args.demod:
print "- POC2400"
print "Squelch: "+str(args.squelch)
print "Gain: "+str(args.gain)
print("- POC2400")
print(("Squelch: "+str(args.squelch)))
print(("Gain: "+str(args.gain)))
if args.verbose:
print "Verbose Mode!"
print("Verbose Mode!")
if args.test:
print "Test Mode!"
print ""
print("Test Mode!")
print("")
except:
logging.error("cannot display shell header")
logging.debug("cannot display shell header", exc_info=True)