Salastil/weather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ConfigParser's readfp with read_file

Browse Source 
Python 3.12 drops the deprecated readfp method from ConfigParser, so
use the newer read_file method instead.
This commit is contained in:
Jeremy Stanley
2024-05-08 02:15:44 +00:00
parent 757b9658f9
commit fc5a61d2b2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weather.py
View File

@@ -1,7 +1,7 @@
"""Contains various object definitions needed by the weather utility.""" """Contains various object definitions needed by the weather utility."""
weather_copyright = """\ 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 # use, copy, modify, and distribute this software is granted under terms
# provided in the LICENSE file distributed with this software. # provided in the LICENSE file distributed with this software.
#""" #"""
@@ -747,7 +747,7 @@ def guess(
if pyversion("3"): if pyversion("3"):
stations.read_string( stations.read_string(
gzip.open(datafile).read().decode("utf-8") ) gzip.open(datafile).read().decode("utf-8") )
else: stations.readfp( gzip.open(datafile) ) else: stations.read_file( gzip.open(datafile) )
else: else:
if pyversion("3"): if pyversion("3"):
stations.read(datafile, encoding="utf-8") stations.read(datafile, encoding="utf-8")
@@ -768,7 +768,7 @@ def guess(
import gzip import gzip
if pyversion("3"): if pyversion("3"):
zones.read_string( gzip.open(datafile).read().decode("utf-8") ) zones.read_string( gzip.open(datafile).read().decode("utf-8") )
else: zones.readfp( gzip.open(datafile) ) else: zones.read_file( gzip.open(datafile) )
else: else:
if pyversion("3"): if pyversion("3"):
zones.read(datafile, encoding="utf-8") zones.read(datafile, encoding="utf-8")
@@ -798,7 +798,7 @@ def guess(
if pyversion("3"): if pyversion("3"):
airports.read_string( airports.read_string(
gzip.open(datafile).read().decode("utf-8") ) gzip.open(datafile).read().decode("utf-8") )
else: airports.readfp( gzip.open(datafile) ) else: airports.read_file( gzip.open(datafile) )
else: else:
if pyversion("3"): if pyversion("3"):
airports.read(datafile, encoding="utf-8") airports.read(datafile, encoding="utf-8")
@@ -890,7 +890,7 @@ def guess(
if pyversion("3"): if pyversion("3"):
zctas.read_string( zctas.read_string(
gzip.open(datafile).read().decode("utf-8") ) gzip.open(datafile).read().decode("utf-8") )
else: zctas.readfp( gzip.open(datafile) ) else: zctas.read_file( gzip.open(datafile) )
else: else:
if pyversion("3"): if pyversion("3"):
zctas.read(datafile, encoding="utf-8") zctas.read(datafile, encoding="utf-8")
@@ -951,7 +951,7 @@ def guess(
if pyversion("3"): if pyversion("3"):
places.read_string( places.read_string(
gzip.open(datafile).read().decode("utf-8") ) gzip.open(datafile).read().decode("utf-8") )
else: places.readfp( gzip.open(datafile) ) else: places.read_file( gzip.open(datafile) )
else: else:
if pyversion("3"): if pyversion("3"):
places.read(datafile, encoding="utf-8") places.read(datafile, encoding="utf-8")
@@ -1605,7 +1605,7 @@ def correlate():
removed = 0 removed = 0
changed = 0 changed = 0
overrides = configparser.ConfigParser() overrides = configparser.ConfigParser()
overrides.readfp( codecs.open(overrides_fn, "r", "utf8") ) overrides.read_file( codecs.open(overrides_fn, "r", "utf8") )
overrideslog = [] overrideslog = []
for section in overrides.sections(): for section in overrides.sections():
addopt = 0 addopt = 0