1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Forwarded: https://github.com/jorisroovers/gitlint/pull/104
From 84145c703a25acad5f2378535c642c5abc299fbe Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 26 Sep 2019 10:48:14 +0200
Subject: [PATCH] replace readfp with Python2 read_file function, to fix a test
failure:
======================================================================
FAIL: test_config_file (test_cli.CLITests)
Test for --config option
----------------------------------------------------------------------
Traceback (most recent call last):
File "/usr/lib/python3.7/unittest/mock.py", line 1248, in patched
return func(*args, **keywargs)
File "/<<PKGBUILDDIR>>/gitlint/tests/test_cli.py", line 372, in test_config_file
self.assertEqual(result.output, "")
AssertionError: "/<<PKGBUILDDIR>>/git[197 chars]od\n" != ''
- /<<PKGBUILDDIR>>/gitlint/config.py:366: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead.
- parser.readfp(config_file, filename) # pylint: disable=deprecated-method
---
gitlint/config.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gitlint/config.py b/gitlint/config.py
index fdc5e85..654523d 100644
--- a/gitlint/config.py
+++ b/gitlint/config.py
@@ -428,8 +428,7 @@ class LintConfigBuilder(object):
parser = ConfigParser()
with io.open(filename, encoding=DEFAULT_ENCODING) as config_file:
- # readfp() is deprecated in python 3.2+, but compatible with 2.7
- parser.readfp(config_file, filename) # pylint: disable=deprecated-method
+ parser.read_file(config_file)
for section_name in parser.sections():
for option_name, option_value in parser.items(section_name):
--
2.17.1
|
