rename globals to globalVars

to prevent to redifine an builtin function

boswatch.py

@@ -24,7 +24,7 @@ import os           # for log mkdir
 import time         # for time.sleep()
 import subprocess   # for starting rtl_fm and multimon-ng
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes import MyTimedRotatingFileHandler  # extension of TimedRotatingFileHandler
 from includes import signalHandler  # TERM-Handler for use script as a daemon
 from includes import checkSubprocesses  # check startup of the subprocesses

exampleAddOns/alarmMonitorRPi/alarmMonitor.py

@@ -36,7 +36,7 @@ import json # for data
 from threading import Thread
 import pygame
 
-import globals
+import globalData
 
 try: 
 	#

exampleAddOns/alarmMonitorRPi/displayServices.py

@@ -31,7 +31,7 @@ def autoTurnOffDisplay():
 	import time
 	import logging
 	import ConfigParser
-	import globals
+	import globalData
 
 	logging.debug("autoTurnOffDisplay-thread started")
 
@@ -81,7 +81,7 @@ def eventHandler():
 	import logging
 	import ConfigParser
 	import pygame
-	import globals
+	import globalData
 
 	logging.debug("eventHandler-thread started")
 
@@ -178,7 +178,7 @@ def displayPainter():
 	import pygame
 	from wrapline import wrapline
 	from roundrects import round_rect
-	import globals
+	import globalData
 
 	logging.debug("displayPainter-thread called")
 

includes/alarmHandler.py

@@ -13,7 +13,7 @@ Handler for the filter and plugins at an alarm
 import logging # Global logger
 import time    # timestamp
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 ##
 #

includes/checkSubprocesses.py

@@ -10,7 +10,7 @@ Used in boswatch.py at startup and designated for watching-service
 
 import logging
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 
 def checkRTL():

includes/decoders/fms.py

@@ -12,7 +12,7 @@ FMS Decoder
 import logging # Global logger
 import re      # Regex for validation
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes import doubleFilter  # double alarm filter
 
 ##

includes/decoders/poc.py

@@ -13,7 +13,7 @@ POCSAG Decoder
 import logging # Global logger
 import re      # Regex for validation
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes import doubleFilter  # double alarm filter
 
 ##

includes/decoders/zvei.py

@@ -12,7 +12,7 @@ ZVEI Decoder
 import logging # Global logger
 import re      # Regex for validation
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes import doubleFilter  # double alarm filter
 
 ##

includes/descriptionList.py

@@ -12,7 +12,7 @@ Function to expand the dataset with a description.
 import logging # Global logger
 import csv # for loading the description files
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes.helper import stringConverter
 
 

includes/doubleFilter.py

@@ -14,7 +14,7 @@ and the time ignoring the id in case of a double alarm
 import logging # Global logger
 import time    # timestamp for doublealarm
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 #
 # ListStructure [0..n] = (ID, TimeStamp, msg)

includes/helper/configHandler.py

@@ -10,7 +10,7 @@ for direct use in plugins to save code
 """
 
 import logging
-from includes import globals
+from includes import globalVars
 
 
 def checkConfig(section=""):

includes/pluginLoader.py

@@ -14,7 +14,7 @@ import imp
 import os
 
 from ConfigParser import NoOptionError # we need this exception
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 def loadPlugins():
 	"""

includes/regexFilter.py

@@ -12,7 +12,7 @@ Functions for the RegEX filter
 import logging # Global logger
 import re #Regex for Filter Check
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 from includes.helper import freqConverter  # converter functions
 
 

includes/shellHeader.py

@@ -10,7 +10,7 @@ Shows the header in shell if quiet mode is not active
 @requires: none
 """
 
-from includes import globals
+from includes import globalVars
 
 def printHeader(args):
 	"""

plugins/BosMon/BosMon.py

@@ -17,7 +17,7 @@ import httplib #for the HTTP request
 import urllib #for the HTTP request with parameters
 import base64 #for the HTTP request with User/Password
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import configHandler
 

plugins/FFAgent/FFAgent.py

@@ -15,7 +15,7 @@ import hmac, hashlib
 import json, requests
 import string
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import timeHandler
 from includes.helper import configHandler

plugins/MySQL/MySQL.py

@@ -16,7 +16,7 @@ import logging # Global logger
 import mysql
 import mysql.connector
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import configHandler
 

plugins/Pushover/Pushover.py

@@ -13,7 +13,7 @@ import time
 import logging # Global logger
 import httplib #for the HTTP request
 import urllib
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import timeHandler
 from includes.helper import configHandler

plugins/README.md

@@ -66,7 +66,7 @@ test2 = 123456
 #### 3.2 Read data from config.ini
 To read yout configuration data you must import the `globals.py` where the global config-object is located:
 ```python
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 ```
 
 Now you can get your configuration data with:

plugins/SMS/SMS.py

@@ -18,7 +18,7 @@ config.ini
 # Imports
 #
 import logging # Global logger
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 # Helper function, uncomment to use
 #from includes.helper import timeHandler

plugins/Sms77/Sms77.py

@@ -13,7 +13,7 @@ import time
 import logging # Global logger
 import httplib #for the HTTP request
 import urllib
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import timeHandler
 from includes.helper import configHandler

plugins/Telegram/Telegram.py

@@ -12,7 +12,7 @@ Plugin to send FMS-, ZVEI- and POCSAG-messages via Telegram
 #
 import logging # Global logger
 import httplib, urllib, telegram, googlemaps
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 # Helper function, uncomment to use
 from includes.helper import configHandler

plugins/eMail/eMail.py

@@ -16,7 +16,7 @@ from email.mime.text import MIMEText # Import the email modules we'll need
 from email.utils import formatdate # need for confirm to RFC2822 standard
 from email.utils import make_msgid # need for confirm to RFC2822 standard
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import timeHandler # helper function
 from includes.helper import configHandler # helper function

plugins/firEmergency/firEmergency.py

@@ -15,7 +15,7 @@ firEmergency configuration:
 import logging # Global logger
 import socket
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import configHandler
 from includes.helper import stringConverter

plugins/httpRequest/httpRequest.py

@@ -14,7 +14,7 @@ import logging # Global logger
 import httplib #for the HTTP request
 from urlparse import urlparse #for split the URL into url and path
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import wildcardHandler
 from includes.helper import configHandler

plugins/jsonSocket/jsonSocket.py

@@ -14,7 +14,7 @@ import logging # Global logger
 import socket  # for connection
 import json    # for data-transfer
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import configHandler
 

plugins/notifyMyAndroid/notifyMyAndroid.py

@@ -16,7 +16,7 @@ import json    # for data-transfer
 import csv     # for loading the APIKeys
 
 
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 from includes.helper import configHandler
 from includes.helper import timeHandler

plugins/template/template.py

@@ -17,7 +17,7 @@ For more information take a look into the other plugins
 # Imports
 #
 import logging # Global logger
-from includes import globals  # Global variables
+from includes import globalVars  # Global variables
 
 # Helper function, uncomment to use
 #from includes.helper import timeHandler