particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#4363: Revert py2 portion of mr#4214

Browse source 
Merges #4363
https://pagure.io/koji/pull-request/4363

Fixes: #4351
https://pagure.io/koji/issue/4351
Builds fail on py2 builders
This commit is contained in:
Mike McLean 2025-04-17 10:12:31 -04:00
commit b6c9ce7a59
3 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
koji/__init__.py
View file

@ -25,7 +25,6 @@
from __future__ import absolute_import, division from __future__ import absolute_import, division
import base64 import base64
import codecs
import datetime import datetime
import errno import errno
import hashlib import hashlib
@ -2343,8 +2342,7 @@ def read_config_files(config_files, raw=False):
if six.PY3: if six.PY3:
config.read(cfgs, encoding="utf8") config.read(cfgs, encoding="utf8")
else: else:
for cfg in cfgs: config.read(cfgs)
config.readfp(codecs.open(cfg, 'r', 'utf8'))
return config return config

21
tests/test_lib/test_utils.py
View file

@ -247,7 +247,6 @@ class ConfigFileTestCase(unittest.TestCase):
if six.PY2: if six.PY2:
self.manager.scp_clz = mock.patch("ConfigParser.SafeConfigParser", self.manager.scp_clz = mock.patch("ConfigParser.SafeConfigParser",
spec=True).start() spec=True).start()
mock.patch('codecs.open').start()
else: else:
self.manager.cp_clz = mock.patch("configparser.ConfigParser", self.manager.cp_clz = mock.patch("configparser.ConfigParser",
spec=True).start() spec=True).start()
@ -299,8 +298,7 @@ class ConfigFileTestCase(unittest.TestCase):
six.moves.configparser.ConfigParser.__class__)) six.moves.configparser.ConfigParser.__class__))
self.real_parser_clz.assert_called_once() self.real_parser_clz.assert_called_once()
if six.PY2: if six.PY2:
self.real_parser_clz.return_value.read.assert_not_called() self.real_parser_clz.return_value.read.assert_called_once_with([files])
self.real_parser_clz.return_value.readfp.assert_called_once()
else: else:
self.real_parser_clz.return_value.read.assert_called_once_with([files], encoding='utf8') self.real_parser_clz.return_value.read.assert_called_once_with([files], encoding='utf8')
@ -311,10 +309,9 @@ class ConfigFileTestCase(unittest.TestCase):
self.real_parser_clz.assert_called_once() self.real_parser_clz.assert_called_once()
if six.PY2: if six.PY2:
self.real_parser_clz.return_value.read.assert_not_called() self.real_parser_clz.return_value.read.assert_called_once()
self.real_parser_clz.return_value.readfp.assert_called()
else: else:
self.real_parser_clz.return_value.read.assert_called() self.real_parser_clz.return_value.read.assert_called_once()
# tuple as config_files # tuple as config_files
self.reset_mock() self.reset_mock()
@ -373,15 +370,13 @@ class ConfigFileTestCase(unittest.TestCase):
conf = koji.read_config_files(files) conf = koji.read_config_files(files)
listdir_mock.assert_has_calls([call('gooddir'), call('emptydir')]) listdir_mock.assert_has_calls([call('gooddir'), call('emptydir')])
self.real_parser_clz.assert_called_once() self.real_parser_clz.assert_called_once()
expected_files = ['test1.conf', 'gooddir/test1-1.conf', 'gooddir/test1-2.conf',
'test2.conf']
if six.PY2: if six.PY2:
self.real_parser_clz.return_value.readfp.assert_called() self.real_parser_clz.return_value.read.assert_called_once_with(expected_files)
else: else:
self.real_parser_clz.return_value.read.assert_called_once_with( self.real_parser_clz.return_value.read.assert_called_once_with(expected_files,
['test1.conf', encoding='utf8')
'gooddir/test1-1.conf',
'gooddir/test1-2.conf',
'test2.conf'],
encoding='utf8')
self.assertEqual(self.manager.isdir.call_count, 5) self.assertEqual(self.manager.isdir.call_count, 5)
self.assertEqual(self.manager.isfile.call_count, 6) self.assertEqual(self.manager.isfile.call_count, 6)
self.assertEqual(self.manager.access.call_count, 4) self.assertEqual(self.manager.access.call_count, 4)

2
tests/test_plugins/test_runroot_builder.py
View file

@ -75,7 +75,7 @@ class FakeConfigParser(object):
else: else:
self.CONFIG = copy.deepcopy(config) self.CONFIG = copy.deepcopy(config)
def read(self, path, encoding): def read(self, path, encoding=None):
return return
def sections(self): def sections(self):