Sort imports with isort

enumerateForge.py

@@ -1,17 +1,16 @@
 #!/usr/bin/python3
-from __future__ import print_function
-import sys
 import os
 import re
-from metautil import *
-from forgeutil import *
-from jsonobject import *
+import sys
 from distutils.version import LooseVersion
 from enum import Enum
 
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
+from forgeutil import *
+from jsonobject import *
+from metautil import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 

fabricutil.py

@@ -1,5 +1,6 @@
-from metautil import *
 import jsonobject
+from metautil import *
+
 
 class FabricInstallerArguments(JsonObject):
     client = ListProperty(StringProperty)

forgeutil.py

@@ -1,6 +1,8 @@
-from metautil import *
 from collections import namedtuple
 
+from metautil import *
+
+
 # A post-processed entry constructed from the reconstructed Forge version index
 class ForgeVersion:
     def __init__(self, entry):

generateFabric.py

@@ -1,9 +1,11 @@
 #!/usr/bin/python3
-from fabricutil import *
-from jsonobject import *
+import copy
+import os
 from datetime import datetime
 from pprint import pprint
-import os, copy
+
+from fabricutil import *
+from jsonobject import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]

generateForge.py

@@ -1,12 +1,12 @@
 #!/usr/bin/python3
-from __future__ import print_function
-import sys
 import os
 import re
-from metautil import *
+import sys
+from distutils.version import LooseVersion
+
 from forgeutil import *
 from jsonobject import *
-from distutils.version import LooseVersion
+from metautil import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]

generateLiteloader.py

@@ -1,10 +1,11 @@
 #!/usr/bin/python3
-from liteloaderutil import *
-from jsonobject import *
-from datetime import datetime
-from pprint import pprint
 import copy
 import os
+from datetime import datetime
+from pprint import pprint
+
+from jsonobject import *
+from liteloaderutil import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]

generateMojang.py

@@ -1,24 +1,18 @@
 #!/usr/bin/python3
-
-import os
-import json
 import copy
 import datetime
-import iso8601
-
+import hashlib
+import json
+import os
+from collections import defaultdict, namedtuple
+from datetime import datetime
+from distutils import version
 from operator import itemgetter
-
 from pprint import pprint
 
+import iso8601
 from metautil import *
 
-from distutils import version
-
-from collections import defaultdict
-from collections import namedtuple
-from datetime import datetime
-import hashlib
-
 PMC_DIR = os.environ["PMC_DIR"]
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 

index.py

@@ -1,11 +1,10 @@
 #!/usr/bin/python3
-
 import hashlib
-import os
 import json
+import os
+from operator import itemgetter
 
 from metautil import *
-from operator import itemgetter
 
 PMC_DIR = os.environ["PMC_DIR"]
 

liteloaderutil.py

@@ -1,5 +1,6 @@
 from metautil import *
 
+
 '''
     "repo":{
         "stream":"RELEASE",
@@ -100,4 +101,3 @@ class LiteloaderMeta(JsonObject):
 class LiteloaderIndex(JsonObject):
     meta = ObjectProperty(LiteloaderMeta, required=True)
     versions = DictProperty(LiteloaderEntry)
-

metautil.py

@@ -1,9 +1,10 @@
+import datetime
 import json
 import os
 from pprint import pprint
-from jsonobject import *
-import datetime
+
 import iso8601
+from jsonobject import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 

updateFabric.py

@@ -1,12 +1,14 @@
 #!/usr/bin/python3
-import os, requests
-from cachecontrol import CacheControl
 import datetime
-import hashlib, json
+import hashlib
+import json
+import os
 import zipfile
-from fabricutil import *
 
+import requests
+from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
+from fabricutil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 

updateForge.py

@@ -2,26 +2,24 @@
 '''
  Get the source files necessary for generating Forge versions
 '''
-from __future__ import print_function
+import copy
+import datetime
+import hashlib
+import json
+import os
+import os.path
+import re
 import sys
+import zipfile
+from contextlib import suppress
+from pathlib import Path
 
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-
-import os
-import json
-import copy
-import re
-import zipfile
-from metautil import *
-from jsonobject import *
 from forgeutil import *
-import os.path
-import datetime
-import hashlib
-from pathlib import Path
-from contextlib import suppress
+from jsonobject import *
+from metautil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 

updateLiteloader.py

@@ -2,19 +2,17 @@
 '''
  Get the source files necessary for generating Forge versions
 '''
-from __future__ import print_function
+import copy
+import json
+import os
+import os.path
 import sys
 
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-
-import os
-import json
 from jsonobject import *
 from liteloaderutil import *
-import os.path
-import copy
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 

updateMojang.py

@@ -1,11 +1,11 @@
 #!/usr/bin/python3
-import requests
-from cachecontrol import CacheControl
 import json
 import os
-from metautil import *
 
+import requests
+from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
+from metautil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]