From eb8b1cc92da0a1dbdac4f578cbc1a5ff6ce3abb9 Mon Sep 17 00:00:00 2001
From: Igor Chubin <igor@chub.in>
Date: Fri, 5 Oct 2018 20:37:16 +0200
Subject: [PATCH] globals.py clean up

---
 lib/globals.py | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/lib/globals.py b/lib/globals.py
index aab7ccf..445328b 100644
--- a/lib/globals.py
+++ b/lib/globals.py
@@ -1,29 +1,33 @@
+"""
+global configuration of the project
+"""
+
 import logging
 import os
 
-MYDIR = os.path.abspath(os.path.dirname( os.path.dirname('__file__') ))
+MYDIR = os.path.abspath(os.path.dirname(os.path.dirname('__file__')))
 
 GEOLITE = os.path.join(MYDIR, 'data', "GeoLite2-City.mmdb")
 WEGO = "/home/igor/go/bin/we-lang"
 PYPHOON = "/home/igor/wttr.in/pyphoon/bin/pyphoon-lolcat"
 
-CACHEDIR  = os.path.join( MYDIR, "cache" )
-IP2LCACHE = os.path.join( MYDIR, "cache/ip2l" )
+CACHEDIR = os.path.join(MYDIR, "cache")
+IP2LCACHE = os.path.join(MYDIR, "cache/ip2l")
 
-ALIASES   = os.path.join( MYDIR, "share/aliases" )
-ANSI2HTML = os.path.join( MYDIR, "share/ansi2html.sh" )
-BLACKLIST = os.path.join( MYDIR, "share/blacklist" )
+ALIASES = os.path.join(MYDIR, "share/aliases")
+ANSI2HTML = os.path.join(MYDIR, "share/ansi2html.sh")
+BLACKLIST = os.path.join(MYDIR, "share/blacklist")
 
-HELP_FILE           = os.path.join( MYDIR, 'share/help.txt' )
-BASH_FUNCTION_FILE  = os.path.join( MYDIR, 'share/bash-function.txt' )
-TRANSLATION_FILE    = os.path.join( MYDIR, 'share/translation.txt' )
-TEST_FILE           = os.path.join( MYDIR, 'share/test-NAME.txt' )
+HELP_FILE = os.path.join(MYDIR, 'share/help.txt')
+BASH_FUNCTION_FILE = os.path.join(MYDIR, 'share/bash-function.txt')
+TRANSLATION_FILE = os.path.join(MYDIR, 'share/translation.txt')
+TEST_FILE = os.path.join(MYDIR, 'share/test-NAME.txt')
 
 IATA_CODES_FILE = os.path.join(MYDIR, 'share/list-of-iata-codes.txt')
 
-LOG_FILE  = os.path.join( MYDIR, 'log/main.log' )
-TEMPLATES = os.path.join( MYDIR, 'share/templates' )
-STATIC    = os.path.join( MYDIR, 'share/static' )
+LOG_FILE = os.path.join(MYDIR, 'log/main.log')
+TEMPLATES = os.path.join(MYDIR, 'share/templates')
+STATIC = os.path.join(MYDIR, 'share/static')
 
 NOT_FOUND_LOCATION = "not found"
 DEFAULT_LOCATION = "oymyakon"
@@ -33,6 +37,8 @@ MALFORMED_RESPONSE_HTML_PAGE = open(os.path.join(STATIC, 'malformed-response.htm
 LISTEN_HOST = ""
 LISTEN_PORT = 8002
 
+MY_EXTERNAL_IP = '5.9.243.187'
+
 PLAIN_TEXT_AGENTS = [
     "curl",
     "httpie",
@@ -46,21 +52,24 @@ PLAIN_TEXT_PAGES = [':help', ':bash.function', ':translation']
 IP2LOCATION_KEY = ''
 
 def error(text):
+    "log error `text` and raise a RuntimeError exception"
+
     if not text.startswith('Too many queries'):
         print text
-    logging.error("ERROR "+text)
+    logging.error("ERROR %s", text)
     raise RuntimeError(text)
 
 def log(text):
+    "log error `text` and do not raise any exceptions"
+
     if not text.startswith('Too many queries'):
         print text
         logging.info(text)
 
 def get_help_file(lang):
+    "Return help file for `lang`"
+
     help_file = os.path.join(MYDIR, 'share/translations/%s-help.txt' % lang)
-    print ">>>", help_file
     if os.path.exists(help_file):
         return help_file
-    else:
-        return HELP_FILE
-
+    return HELP_FILE