From 37b4b68e8377bd0daf76667890c05ab461790b77 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 14 Apr 2015 13:40:21 -0700 Subject: [PATCH] Use six.moves to find configparser instead of our compat code --- v2/ansible/compat/configparser.py | 30 ------------------------------ v2/ansible/constants.py | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 v2/ansible/compat/configparser.py diff --git a/v2/ansible/compat/configparser.py b/v2/ansible/compat/configparser.py deleted file mode 100644 index 7cce6423763..00000000000 --- a/v2/ansible/compat/configparser.py +++ /dev/null @@ -1,30 +0,0 @@ -# (c) 2014, Toshio Kuratomi -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -''' -Compat module for Python3.x's configparser -''' - -# Python 2.7 -try: - from configparser import * -except ImportError: - from ConfigParser import * diff --git a/v2/ansible/constants.py b/v2/ansible/constants.py index 72b571ebb80..5932db0b2ce 100644 --- a/v2/ansible/constants.py +++ b/v2/ansible/constants.py @@ -23,7 +23,7 @@ import os import pwd import sys -from . compat import configparser +from six.moves import configparser from string import ascii_letters, digits # copied from utils, avoid circular reference fun :)