From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 8 May 2024 02:15:44 +0000 (+0000)
Subject: Replace ConfigParser's readfp with read_file
X-Git-Tag: 2.5.0~12
X-Git-Url: https://yuggoth.org/gitweb?a=commitdiff_plain;h=fc5a61d2b2ea632a1515384443bc644aef0d2765;p=weather.git

Replace ConfigParser's readfp with read_file

Python 3.12 drops the deprecated readfp method from ConfigParser, so
use the newer read_file method instead.
---

diff --git a/weather.py b/weather.py
index cc632e1..493be0a 100644
--- a/weather.py
+++ b/weather.py
@@ -1,7 +1,7 @@
 """Contains various object definitions needed by the weather utility."""
 
 weather_copyright = """\
-# Copyright (c) 2006-2023 Jeremy Stanley <fungi@yuggoth.org>. Permission to
+# Copyright (c) 2006-2024 Jeremy Stanley <fungi@yuggoth.org>. Permission to
 # use, copy, modify, and distribute this software is granted under terms
 # provided in the LICENSE file distributed with this software.
 #"""
@@ -747,7 +747,7 @@ def guess(
             if pyversion("3"):
                 stations.read_string(
                     gzip.open(datafile).read().decode("utf-8") )
-            else: stations.readfp( gzip.open(datafile) )
+            else: stations.read_file( gzip.open(datafile) )
         else:
             if pyversion("3"):
                 stations.read(datafile, encoding="utf-8")
@@ -768,7 +768,7 @@ def guess(
             import gzip
             if pyversion("3"):
                 zones.read_string( gzip.open(datafile).read().decode("utf-8") )
-            else: zones.readfp( gzip.open(datafile) )
+            else: zones.read_file( gzip.open(datafile) )
         else:
             if pyversion("3"):
                 zones.read(datafile, encoding="utf-8")
@@ -798,7 +798,7 @@ def guess(
                 if pyversion("3"):
                     airports.read_string(
                         gzip.open(datafile).read().decode("utf-8") )
-                else: airports.readfp( gzip.open(datafile) )
+                else: airports.read_file( gzip.open(datafile) )
             else:
                 if pyversion("3"):
                     airports.read(datafile, encoding="utf-8")
@@ -890,7 +890,7 @@ def guess(
                 if pyversion("3"):
                     zctas.read_string(
                         gzip.open(datafile).read().decode("utf-8") )
-                else: zctas.readfp( gzip.open(datafile) )
+                else: zctas.read_file( gzip.open(datafile) )
             else:
                 if pyversion("3"):
                     zctas.read(datafile, encoding="utf-8")
@@ -951,7 +951,7 @@ def guess(
                 if pyversion("3"):
                     places.read_string(
                         gzip.open(datafile).read().decode("utf-8") )
-                else: places.readfp( gzip.open(datafile) )
+                else: places.read_file( gzip.open(datafile) )
             else:
                 if pyversion("3"):
                     places.read(datafile, encoding="utf-8")
@@ -1605,7 +1605,7 @@ def correlate():
     removed = 0
     changed = 0
     overrides = configparser.ConfigParser()
-    overrides.readfp( codecs.open(overrides_fn, "r", "utf8") )
+    overrides.read_file( codecs.open(overrides_fn, "r", "utf8") )
     overrideslog = []
     for section in overrides.sections():
         addopt = 0