Python scripts: Unify encoding magic comments

data/tools/GUI.pyw

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 # By Elvish_Hunter, April 2014
 

data/tools/about_cfg_to_wiki

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# encoding: utf8
+# encoding: utf-8
 #
 
 #

data/tools/addon_manager/html.py

@@ -1,4 +1,4 @@
-# encoding: utf8
+# encoding: utf-8
 import time, os, glob, sys, re
 from subprocess import Popen
 

data/tools/campaign2wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#-*- coding: utf-8 -*-
+# encoding: utf-8
 
 """
 A script that autogenerates some information about campaigns for the

data/tools/terrain2wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# -*- coding:utf-8 -*-
+# encoding: utf-8
 
 """
 A script to create the "Terrain Table" on the TerrainCodeTableWML wiki page.

data/tools/unit_tree/html_output.py

@@ -1,4 +1,4 @@
-#encoding: utf8
+# encoding: utf-8
 
 import os, gettext, time, copy, sys, re
 import traceback

data/tools/wesnoth/wmldata.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# encoding: utf8
+# encoding: utf-8
 
 """
 NOTE: You should use wmlparser2.py instead which uses the C++

data/tools/wesnoth/wmlparser.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# encoding: utf8
+# encoding: utf-8
 import wmldata, os, glob, sys
 import re
 

data/tools/wesnoth/wmlparser2.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# encoding: utf8
+# encoding: utf-8
 
 """
 This parser uses the --preprocess option of wesnoth so a working

data/tools/wesnoth/wmlparser3.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# encoding: utf8
+# encoding: utf-8
 
 """
 This parser uses the --preprocess option of wesnoth so a working

data/tools/wesnoth_addon_manager

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# encoding: utf8
+# encoding: utf-8
 """
 add-on_manager.py -- a command-line client for the Wesnoth add-on server
 

data/tools/wmlindent

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 """\
 wmlindent - re-indent WML in a uniform way.
 

data/tools/wmllint

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 #
 # wmllint -- check WML for conformance to the most recent dialect
 #

data/tools/wmlscope

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 #
 # wmlscope -- generate reports on WML macro and resource usage
 #

data/tools/wmlunits

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-#encoding: utf8
+# encoding: utf-8
 """
 wmlunits -- tool to output information on all units in HTML
 

utils/pofix.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 # pofix - perform string fixups on incoming .po files.
 #
@@ -175,7 +175,7 @@ except ImportError:
     parallel_map = map
 
 def process_file(path):
-    before = io.open(path, "r", encoding="utf8").read()
+    before = io.open(path, "r", encoding="utf-8").read()
     decommented = re.sub("#.*", "", before)
     lines = before.split('\n')
     if website_mode:
@@ -209,7 +209,7 @@ def process_file(path):
         # Save a backup
         os.rename(path, path + "-bak")
         # Write out transformed version
-        ofp = io.open(path, "w", encoding="utf8")
+        ofp = io.open(path, "w", encoding="utf-8")
         ofp.write(after)
         ofp.close()
         return 1

utils/wmlxgettext

@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
-
-
-# encoding: utf8
+# encoding: utf-8
 #
 # wmlxgettext -- generate a blank .po file for official campaigns translations 
 #                    (build tool for wesnoth core)