[gimp-web/migrate/py3] Fix JSON parsing in pelicanconf.*



commit 3a997840e45681e6f634eb4338dc87cbb750700b
Author: Pat David <patdavid gmail com>
Date:   Thu Jul 11 17:13:35 2019 -0500

    Fix JSON parsing in pelicanconf.*
    
    OrderedDicts act differently in Py3 vs. Py2, so had to wrap the
    iterator as a list() object to index through it properly.
    
    Had to do the same for any calls to *.value() as well.
    
    Removed the "ordered_dict" pass in json.load as it's no longer
    needed.

 pelicanconf.local.py | 80 ++++++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/pelicanconf.local.py b/pelicanconf.local.py
index d084c186..13d421e2 100644
--- a/pelicanconf.local.py
+++ b/pelicanconf.local.py
@@ -146,16 +146,16 @@ CACHE_CONTENT = True
 import json
 from collections import OrderedDict
 with open('GIMP_VERSIONS') as data:
-    GIMP = json.load(data, object_pairs_hook=OrderedDict)
+    GIMP = json.load(data)
 
 if 'STABLE' in GIMP:
     # Set the current stable GIMP version from
     # the GIMP_VERSIONS json file.  The most
     # current version _should_ be the first key
     # hence, .keys()[0]
-    GIMP_VERSION = GIMP['STABLE'].keys()[0]
+    GIMP_VERSION = list(GIMP['STABLE'].keys())[0]
     GIMP_MAJOR_MINOR_VERSION = GIMP_VERSION[:GIMP_VERSION.index('.', GIMP_VERSION.index('.') + 1)]
-    for version, info in GIMP['STABLE'].iteritems() :
+    for version, info in GIMP['STABLE'].items() :
         if 'date' in info:
             try:
                 RELEASE_DATE
@@ -167,34 +167,34 @@ if 'STABLE' in GIMP:
             except NameError:
                 WINDOWS_VER = version
                 WINDOWS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
-                WINDOWS_FILE = info['windows'].keys()[0]
-                if 'sha256' in info['windows'].values()[0]:
+                WINDOWS_FILE = list(info['windows'].keys())[0]
+                if 'sha256' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN = 'sha256'
-                elif 'sha512' in info['windows'].values()[0]:
+                elif 'sha512' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN = 'sha512'
-                elif 'md5' in info['windows'].values()[0]:
+                elif 'md5' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN = 'md5'
-                WINDOWS_HASH = info['windows'].values()[0][WINDOWS_HASH_FUN]
-                if 'min-support' in info['windows'].values()[0]:
-                    WINDOWS_MIN_SUPPORT = info['windows'].values()[0]["min-support"]
+                WINDOWS_HASH = list(info['windows'].values())[0][WINDOWS_HASH_FUN]
+                if 'min-support' in list(info['windows'].values())[0]:
+                    WINDOWS_MIN_SUPPORT = list(info['windows'].values())[0]["min-support"]
         if 'macos' in info:
             try:
                 MACOS_FILE
             except NameError:
                 MACOS_VER = version
                 MACOS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
-                MACOS_FILE = info['macos'].keys()[0]
-                if 'sha256' in info['macos'].values()[0]:
+                MACOS_FILE = list(info['macos'].keys())[0]
+                if 'sha256' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN = 'sha256'
-                elif 'sha512' in info['macos'].values()[0]:
+                elif 'sha512' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN = 'sha512'
-                elif 'md5' in info['macos'].values()[0]:
+                elif 'md5' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN = 'md5'
-                MACOS_HASH = info['macos'].values()[0][MACOS_HASH_FUN]
-                if 'min-support' in info['macos'].values()[0]:
-                    MACOS_MIN_SUPPORT = info['macos'].values()[0]["min-support"]
+                MACOS_HASH = list(info['macos'].values())[0][MACOS_HASH_FUN]
+                if 'min-support' in list(info['macos'].values())[0]:
+                    MACOS_MIN_SUPPORT = list(info['macos'].values())[0]["min-support"]
 else:
-    print 'STABLE not defined'
+    print('STABLE not defined')
 
 
 if 'OLDSTABLE' in GIMP:
@@ -202,9 +202,9 @@ if 'OLDSTABLE' in GIMP:
     # the GIMP_VERSIONS json file.  The most
     # current version _should_ be the first key
     # hence, .keys()[0]
-    GIMP_VERSION_OLDSTABLE = GIMP['OLDSTABLE'].keys()[0]
+    GIMP_VERSION_OLDSTABLE = list(GIMP['OLDSTABLE'].keys())[0]
     GIMP_MAJOR_MINOR_VERSION_OLDSTABLE= GIMP_VERSION_OLDSTABLE[:GIMP_VERSION_OLDSTABLE.index('.', 
GIMP_VERSION_OLDSTABLE.index('.') + 1)]
-    for version, info in GIMP['OLDSTABLE'].iteritems() :
+    for version, info in GIMP['OLDSTABLE'].items() :
         if 'date' in info:
             try:
                 RELEASE_DATE_OLDSTABLE
@@ -216,23 +216,23 @@ if 'OLDSTABLE' in GIMP:
             except NameError:
                 WINDOWS_VER_OLDSTABLE = version
                 WINDOWS_MAJOR_MINOR_VER_OLDSTABLE = version[:version.index('.', version.index('.') + 1)]
-                WINDOWS_FILE_OLDSTABLE = info['windows'].keys()[0]
-                WINDOWS_HASH_OLDSTABLE = info['windows'].values()[0]
+                WINDOWS_FILE_OLDSTABLE = list(info['windows'].keys())[0]
+                WINDOWS_HASH_OLDSTABLE = list(info['windows'].values())[0]
         if 'macos' in info:
             try:
                 MACOS_FILE_OLDSTABLE
             except NameError:
                 MACOS_VER_OLDSTABLE = version
                 MACOS_MAJOR_MINOR_VER_OLDSTABLE= version[:version.index('.', version.index('.') + 1)]
-                MACOS_FILE_OLDSTABLE = info['macos'].keys()[0]
-                MACOS_HASH_OLDSTABLE = info['macos'].values()[0]
+                MACOS_FILE_OLDSTABLE = list(info['macos'].keys())[0]
+                MACOS_HASH_OLDSTABLE = list(info['macos'].values())[0]
 else:
-    print 'OLDSTABLE not defined'
+    print('OLDSTABLE not defined')
 
 if 'DEVELOPMENT' in GIMP:
     # development version
-    GIMP_VERSION_DEVELOPMENT = GIMP['DEVELOPMENT'].keys()[0]
-    for version, info in GIMP['DEVELOPMENT'].iteritems() :
+    GIMP_VERSION_DEVELOPMENT = list(GIMP['DEVELOPMENT'].keys())[0]
+    for version, info in GIMP['DEVELOPMENT'].items() :
         if 'date' in info:
             try:
                 RELEASE_DATE_DEVELOPMENT
@@ -243,27 +243,27 @@ if 'DEVELOPMENT' in GIMP:
                 WINDOWS_FILE_DEVELOPMENT
             except NameError:
                 WINDOWS_VER_DEVELOPMENT = version
-                WINDOWS_FILE_DEVELOPMENT = info['windows'].keys()[0]
-                if 'sha256' in info['windows'].values()[0]:
+                WINDOWS_FILE_DEVELOPMENT = list(info['windows'].keys())[0]
+                if 'sha256' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN_DEVELOPMENT = 'sha256'
-                elif 'sha512' in info['windows'].values()[0]:
+                elif 'sha512' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN_DEVELOPMENT = 'sha512'
-                elif 'md5' in info['windows'].values()[0]:
+                elif 'md5' in list(info['windows'].values())[0]:
                     WINDOWS_HASH_FUN_DEVELOPMENT = 'md5'
-                WINDOWS_HASH_DEVELOPMENT = info['windows'].values()[0][WINDOWS_HASH_FUN_DEVELOPMENT]
+                WINDOWS_HASH_DEVELOPMENT = list(info['windows'].values())[0][WINDOWS_HASH_FUN_DEVELOPMENT]
         if 'macos' in info:
             try:
                 MACOS_FILE_DEVELOPMENT
             except NameError:
                 MACOS_VER_DEVELOPMENT = version
-                MACOS_FILE_DEVELOPMENT = info['macos'].keys()[0]
-                if 'sha256' in info['macos'].values()[0]:
+                MACOS_FILE_DEVELOPMENT = list(info['macos'].keys())[0]
+                if 'sha256' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN_DEVELOPMENT = 'sha256'
-                elif 'sha512' in info['macos'].values()[0]:
+                elif 'sha512' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN_DEVELOPMENT = 'sha512'
-                elif 'md5' in info['macos'].values()[0]:
+                elif 'md5' in list(info['macos'].values())[0]:
                     MACOS_HASH_FUN_DEVELOPMENT = 'md5'
-                MACOS_HASH_DEVELOPMENT = info['macos'].values()[0][MACOS_HASH_FUN_DEVELOPMENT]
+                MACOS_HASH_DEVELOPMENT = list(info['macos'].values())[0][MACOS_HASH_FUN_DEVELOPMENT]
         if 'flatpak' in info:
             try:
                 FLATPAK_FILE_DEVELOPMENT
@@ -271,11 +271,11 @@ if 'DEVELOPMENT' in GIMP:
                 FLATPAK_VER_DEVELOPMENT = version
                 FLATPAK_FILE_DEVELOPMENT = {}
                 FLATPAK_HASH_DEVELOPMENT = {}
-                for arch, package in info['flatpak'].iteritems() :
-                    FLATPAK_FILE_DEVELOPMENT[arch] = package.keys()[0]
+                for arch, package in info['flatpak'].items() :
+                    FLATPAK_FILE_DEVELOPMENT[arch] = list(package.keys())[0]
                     FLATPAK_HASH_DEVELOPMENT[arch] = package.values()[0]
 else:
-    print 'DEVELOPMENT not defined'
+    print('DEVELOPMENT not defined')
 
 #
 # Random Header Background Image


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]