Py2topy3

CONFIG/autowrf_classlib.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 import datetime as dt
 import math
 from collections import OrderedDict
@@ -64,9 +64,9 @@ def ReadNamelist(self, namelist_file):
 
     def WriteNamelist(self, out_filename):
         with open(out_filename, 'w') as f:
-            for sect, optlist in self.opts.iteritems():
+            for sect, optlist in self.opts.items():
                 f.write("&"+sect+"\n")
-                for optname, optvals in optlist.iteritems():
+                for optname, optvals in optlist.items():
                     padding = " " * (self.opt_field_width - len(optname) - 1)
                     f.write(" "+optname+padding+"= ")
                     for val in optvals:
@@ -416,7 +416,7 @@ def AdjustMapProjOpts(self, map_proj, neiproj=False):
         # Setting neiproj to true will alter the messages printed if options are changed.
         proj_opts, all_opts = self.MapProjOptions(map_proj)
         # All these options are in the "geogrid" section
-        curr_opts = self.opts["geogrid"].keys()
+        curr_opts = list(self.opts["geogrid"].keys())
         opt_added = False
         opt_removed = False
         for opt in all_opts:
@@ -444,7 +444,7 @@ def AdjustMapProjOpts(self, map_proj, neiproj=False):
                 msg_print("geogrid options have changed with the map projection.")
                 msg_print("The NEI compatibility checker will help you set them.")
 
-            junk = raw_input("Press ENTER to continue.")
+            junk = input("Press ENTER to continue.")
 
 
 class NamelistContainer:
@@ -850,7 +850,7 @@ def UserSetMozFile():
             msg_print("This must be created and contain your MOZBC files. Both")
             msg_print("this program and the MOZBC component of the automatic WRF")
             msg_print("program rely on this.")
-            raw_input("Press ENTER to continue")
+            input("Press ENTER to continue")
             return None
 
         tmp = glob(os.path.join(mozDataDir, "*.nc"))
@@ -859,7 +859,7 @@ def UserSetMozFile():
             msg_print("No MOZBC data files present! You need to download some.")
             msg_print("As of 20 Jul 2016, they can be obtained at")
             msg_print("http://www.acom.ucar.edu/wrf-chem/mozart.shtml")
-            raw_input("Press ENTER to continue")
+            input("Press ENTER to continue")
             return None
 
         newMozFilename = UI.UserInputList("Choose the MOZBC file to use: ", mozFiles,currentvalue=mozFilename)
@@ -870,7 +870,7 @@ def UserSetMozFile():
             msg_print("the input preparation step. Rerunning 'autowrfchem config namelist'")
             msg_print("and modifying the current namelist will allow you to select a file")
             msg_print("later.")
-            raw_input("Press ENTER to continue")
+            input("Press ENTER to continue")
             return None
 
         wroteMoz=False
@@ -885,11 +885,11 @@ def UserSetMozFile():
                 cfgw.write("mozbcFile=\"{0}\"\n".format(newMozFilename))
 
     def UserSetOtherOpt(self, namelist):
-        sect = UI.UserInputList("Choose the namelist section: ", namelist.opts.keys())
+        sect = UI.UserInputList("Choose the namelist section: ", list(namelist.opts.keys()))
         if sect is None:
             return
 
-        k = namelist.opts[sect].keys()
+        k = list(namelist.opts[sect].keys())
         if len(k) == 0:
             msg_print("{0} has no options".format(sect))
             return
@@ -913,16 +913,16 @@ def UserSetOtherOpt(self, namelist):
                 namelist.SetOptVal(sect, opt, optval)
 
     def DisplayOptions(self, namelist):
-        sectnames = namelist.opts.keys()
+        sectnames = list(namelist.opts.keys())
         sectnames.append("All")
         sect = UI.UserInputList("Which namelist section to display?", sectnames)
         if sect == "All":
-            for s in namelist.opts.keys():
+            for s in list(namelist.opts.keys()):
                 msg_print("{0}:".format(s))
-                for k,v in namelist.opts[s].iteritems():
+                for k,v in namelist.opts[s].items():
                     msg_print("  {0} = {1}".format(k,v))
         elif sect is not None:
-            for k,v in namelist.opts[sect].iteritems():
+            for k,v in namelist.opts[sect].items():
                 msg_print("  {0} = {1}".format(k,v))
 
     def UserNEICompatCheck(self):
@@ -1111,7 +1111,7 @@ def UserInputList( prompt, options, returntype="value", currentvalue=None, empty
             print("  {2}{0}: {1}".format(i, options[i-1], currstr))
 
         while True:
-            userans = raw_input("Enter 1-{0}: ".format(len(options)))
+            userans = input("Enter 1-{0}: ".format(len(options)))
             if len(userans) == 0:
                 return None
 
@@ -1146,7 +1146,7 @@ def UserInputDate( prompt, currentvalue=None):
             print("Current value is {0}".format(currentvalue))
 
         while True:
-            userdate = raw_input("--> ")
+            userdate = input("--> ")
             userdate = userdate.strip()
             if len(userdate) == 0:
                 return None
@@ -1188,7 +1188,7 @@ def UserInputDate( prompt, currentvalue=None):
             # Take advantage of datetime's built in checking to be sure we have a valid date
             try:
                 dateout = dt.datetime(yr,mn,dy,hour,min,sec)
-            except ValueError, e:
+            except ValueError as e:
                 print("Problem with date/time entered: {0}".format(str(e)))
                 continue
 
@@ -1207,7 +1207,7 @@ def UserInputValue( optname, isbool=False, currval=None, noempty=False):
 
         while True:
             if isbool:
-                userans = raw_input("T/F: ").lower().strip()
+                userans = input("T/F: ").lower().strip()
                 if userans == "t":
                     return ".true."
                 elif userans == "f":
@@ -1217,7 +1217,7 @@ def UserInputValue( optname, isbool=False, currval=None, noempty=False):
                 else:
                     print("Option is a boolean. Must enter T or F.")
             else:
-                userans = raw_input("--> ").strip()
+                userans = input("--> ").strip()
                 if len(userans) == 0 and not noempty:
                     return None
                 elif len(userans) == 0 and noempty:
@@ -1234,7 +1234,7 @@ def UserInputYN(prompt, default="y"):
             else:
                 defstr = " y/[n]"
                 defaultans = False
-            userans = raw_input(prompt + defstr + ": ")
+            userans = input(prompt + defstr + ": ")
 
             if userans == "":
                 return defaultans

CONFIG/autowrf_namelist_main.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 import sys
 import os
 import datetime as dt
@@ -126,7 +126,7 @@ def SaveMenu(nlc):
 
         nlc.WriteNamelists(dir=NamelistsPath(), suffix=suffix)
 
-        userans = raw_input("Do you also write to make these the current namelist? y/[n]: ")
+        userans = input("Do you also write to make these the current namelist? y/[n]: ")
         if userans.lower() == "y":
             print("Writing out namelists.")
             nlc.WriteNamelists(dir=my_dir)

PREPINPUT/bestemissyear.py

@@ -2,7 +2,7 @@
 # best represents the emissions for it and prints out a start
 # date which can be used by the namelist program to set the
 # start date for convert_emiss.F
-from __future__ import print_function
+
 import datetime as dt
 import argparse
 import re

PREPINPUT/metgriblist.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 import argparse
 import calendar
 import datetime as dt

PREPINPUT/mozcheck.py

@@ -1,5 +1,5 @@
 # check that the given Mozart file covers the time range and the domain plus a 10 degree buffer
-from __future__ import print_function
+
 import argparse
 import datetime as dt
 import os
@@ -55,12 +55,12 @@ def get_run_info(wrfin, stime_str, etime_str):
 def convert_moz_date(dateint, datesec):
     # MOZ dates are given as an integer with 8 digits. The first four are year, then two month, then two for day
     # Some arithmetic sneakiness to break it apart
-    yr = dateint/10000
-    mn = (dateint % 10000)/100
+    yr = dateint//10000
+    mn = (dateint % 10000)//100
     dy = dateint % 100
 
-    hour = datesec / 3600
-    minute = (datesec % 3600)/60
+    hour = datesec // 3600
+    minute = (datesec % 3600)//60
     sec = datesec % 60
     return dt.datetime(year=yr, month=mn, day=dy, hour=hour, minute=minute, second=sec)
 

PREPINPUT/postcheck.py

@@ -11,7 +11,7 @@
 #               4 bit: on = wrfinput missing variables, off = variables below min threshold
 #               8 bit = problem with wrfbdy
 #               16 bit: on = wrfbdy missing variables, off = variables below min threshold
-from __future__ import print_function
+
 import pdb
 import argparse
 import re
@@ -38,7 +38,7 @@ def get_var_names(filename):
         return pync.call_ncdump_varnames(filename)
     else:
         rgrp = ncdat(filename)
-        return rgrp.variables.keys()
+        return list(rgrp.variables.keys())
         rgrp.close()
 
 def get_var_values(varnames, filename):

Tools/datecompare.py

@@ -3,7 +3,7 @@
 # datecompare.py - python script that can be used to compare two dates given as strings
 #   Gives exit status of 0 if comparison is true, 1 if false, so can be used in shell if
 #   statements.
-from __future__ import print_function
+
 import argparse
 import datetime as dt
 import re

Tools/gc2moz/python/gc2moz.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 import argparse
 from bpch import bpch
 import datetime as dt
@@ -166,9 +166,9 @@ def unit_conversion(current_values, unit_type, current_unit, new_unit):
     else:
         raise ValueError('Unit type "{0}" not recognized'.format(unit_type))
 
-    if current_unit not in conv_factors.keys():
+    if current_unit not in list(conv_factors.keys()):
         raise KeyError('{0} unit "{1}" not defined'.format(unit_type, current_unit))
-    if new_unit not in conv_factors.keys():
+    if new_unit not in list(conv_factors.keys()):
         raise KeyError('{0} unit "{1}" not defined'.format(unit_type, new_unit))
 
     return current_values * conv_factors[new_unit] / conv_factors[current_unit]
@@ -400,13 +400,13 @@ def write_chem_species(ncfile, filetimes):
     # Find all GEOS variables in the categories defined as static variables
     b = bpch(filetimes.unique_files()[0])
     gc_moz_names = {} # this will be a dictionary with the GC name as the key and the MOZART-like name as the value
-    for k in b.variables.keys():
+    for k in list(b.variables.keys()):
         for cat in gc_categories:
             if cat in k:
                 gc_moz_names[k] = geos_to_moz_name(k)
     b.close()
 
-    for gc_name, moz_name in gc_moz_names.iteritems():
+    for gc_name, moz_name in gc_moz_names.items():
         if __debug_level__ > 1:
             shell_msg('  Writing {0} as {1}'.format(gc_name, moz_name))
         val = []
@@ -452,7 +452,7 @@ def add_methane(ncfile):
     lat = ncfile.variables['lat'][:]
 
     # Find a chemistry variable to get the shape of
-    for k in ncfile.variables.keys():
+    for k in list(ncfile.variables.keys()):
         if moz_suffix in k:
             chem_key = k
             break

Tools/gc2moz/python/gcCH4bins.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 import sys
 __author__ = 'Josh'
 

Tools/pyncdf.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 import numpy as np
 import os
 import re