Merge 8e230d5 into f3e8f43

th3-z · Oct 6, 2019 · 16cf529 · 16cf529
2 parents f3e8f43 + 8e230d5
commit 16cf529
Show file tree

Hide file tree

Showing 29 changed files with 1,093 additions and 157 deletions.
diff --git a/admin_patches/admin_patches.py b/admin_patches/admin_patches.py
@@ -1,9 +1,9 @@
-from os import path
 import argparse
 import gettext
+from os import path
 
-from utils import find_data_file, die, info
-from utils.patcher import validate_files, patch_files
+from utils import die, find_data_file, info
+from utils.patcher import patch_files, validate_files
 
 _ = gettext.gettext
 

diff --git a/admin_patches/utils/patch.py b/admin_patches/utils/patch.py
@@ -12,12 +12,18 @@
 """
 from __future__ import print_function
 
-__author__ = "anatoly techtonik <techtonik@gmail.com>"
-__version__ = "1.16"
-
 import copy
 import logging
+import os
+import posixpath
 import re
+import shutil
+import sys
+from os.path import abspath, exists, isfile
+
+__author__ = "anatoly techtonik <techtonik@gmail.com>"
+__version__ = "1.16"
+
 
 # cStringIO doesn't support unicode in 2.5
 try:
@@ -29,11 +35,6 @@
 except ImportError:
   import urllib.request as urllib_request
 
-from os.path import exists, isfile, abspath
-import os
-import posixpath
-import shutil
-import sys
 
 
 PY3K = sys.version_info >= (3, 0)

diff --git a/admin_patches/utils/patcher.py b/admin_patches/utils/patcher.py
@@ -1,6 +1,6 @@
+import gettext
 import os
 from hashlib import md5
-import gettext
 
 from checksums import ORIG_MD5
 from utils import find_data_file, info, warning

diff --git a/locale/admin_patches.pot b/locale/admin_patches.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-05 19:33+0100\n"
+"POT-Creation-Date: 2019-10-06 15:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/locale/en_GB/admin_patches.po b/locale/en_GB/admin_patches.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-05 19:33+0100\n"
-"PO-Revision-Date: 2019-10-05 19:33+0100\n"
+"POT-Creation-Date: 2019-10-06 15:35+0100\n"
+"PO-Revision-Date: 2019-10-06 15:35+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en_GB\n"
 "Language-Team: en_GB <LL@li.org>\n"