diff options
| author | Torsten Marek <shlomme@gmail.com> | 2014-11-09 10:33:29 +0100 |
|---|---|---|
| committer | Torsten Marek <shlomme@gmail.com> | 2014-11-09 10:33:29 +0100 |
| commit | 0ed61a71b1756e204cd57d3711c7f4d0b90ebef2 (patch) | |
| tree | cc704a4444b0686293e860ce785b8f8f9008efeb /test/test_functional.py | |
| parent | 052955e6b48af4ac80448fbb87ca2e6702f9a8e4 (diff) | |
| download | pylint-git-0ed61a71b1756e204cd57d3711c7f4d0b90ebef2.tar.gz | |
Make most tests run unmodified under Python 3.4.
Diffstat (limited to 'test/test_functional.py')
| -rw-r--r-- | test/test_functional.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/test_functional.py b/test/test_functional.py index ead8f586d..f9e33fa1c 100644 --- a/test/test_functional.py +++ b/test/test_functional.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import csv import collections -import ConfigParser import io import operator import os @@ -11,6 +10,9 @@ import sys import platform import unittest +import six +from six.moves import configparser + from pylint import checkers from pylint import interfaces from pylint import lint @@ -113,7 +115,7 @@ class TestFile(object): self._parse_options() def _parse_options(self): - cp = ConfigParser.ConfigParser() + cp = configparser.ConfigParser() cp.add_section('testoptions') try: cp.read(self.option_file) @@ -204,7 +206,7 @@ def multiset_difference(left_op, right_op): missing = left_op.copy() missing.subtract(right_op) unexpected = {} - for key, value in missing.items(): + for key, value in list(six.iteritems(missing)): if value <= 0: missing.pop(key) if value < 0: |