Remove global var

Author: StanFromIreland

Tools/i18n/msgfmt.py

@@ -37,29 +37,24 @@
 __version__ = "1.2"
 
 
-MESSAGES = {}
-
-
 def usage(code, msg=''):
     print(__doc__, file=sys.stderr)
     if msg:
         print(msg, file=sys.stderr)
     sys.exit(code)
 
 
-def add(ctxt, id, str, fuzzy):
+def add(MESSAGES, ctxt, id, str, fuzzy):
     "Add a non-fuzzy translation to the dictionary."
-    global MESSAGES
     if not fuzzy and str:
         if ctxt is None:
             MESSAGES[id] = str
         else:
             MESSAGES[b"%b\x04%b" % (ctxt, id)] = str
 
 
-def generate():
+def generate(MESSAGES):
     "Return the generated output."
-    global MESSAGES
     # the keys are sorted in the .mo file
     keys = sorted(MESSAGES.keys())
     offsets = []
@@ -99,9 +94,7 @@ def generate():
 
 
 def make(filename, outfile):
-    global MESSAGES
-    MESSAGES.clear()
-
+    MESSAGES = {}
     ID = 1
     STR = 2
     CTXT = 3
@@ -143,7 +136,7 @@ def make(filename, outfile):
         lno += 1
         # If we get a comment line after a msgstr, this is a new entry
         if l[0] == '#' and section == STR:
-            add(msgctxt, msgid, msgstr, fuzzy)
+            add(MESSAGES, msgctxt, msgid, msgstr, fuzzy)
             section = msgctxt = None
             fuzzy = 0
         # Record a fuzzy mark
@@ -155,7 +148,7 @@ def make(filename, outfile):
         # Now we are in a msgid or msgctxt section, output previous section
         if l.startswith('msgctxt'):
             if section == STR:
-                add(msgctxt, msgid, msgstr, fuzzy)
+                add(MESSAGES, msgctxt, msgid, msgstr, fuzzy)
             section = CTXT
             l = l[7:]
             msgctxt = b''
@@ -172,7 +165,7 @@ def make(filename, outfile):
                     charset = p.parsestr(msgstr.decode(encoding)).get_content_charset()
                     if charset:
                         encoding = charset
-                add(msgctxt, msgid, msgstr, fuzzy)
+                add(MESSAGES, msgctxt, msgid, msgstr, fuzzy)
                 msgctxt = None
             section = ID
             l = l[5:]
@@ -222,10 +215,10 @@ def make(filename, outfile):
             sys.exit(1)
     # Add last entry
     if section == STR:
-        add(msgctxt, msgid, msgstr, fuzzy)
+        add(MESSAGES, msgctxt, msgid, msgstr, fuzzy)
 
     # Compute output
-    output = generate()
+    output = generate(MESSAGES)
 
     try:
         with open(outfile,"wb") as f: