summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Edmund Crosley <timothy.crosley@gmail.com>2014-12-25 01:27:21 -0500
committerTimothy Edmund Crosley <timothy.crosley@gmail.com>2014-12-25 01:27:21 -0500
commitd20e8ff8fbef2e0864796ab75d1e870ccabce525 (patch)
treecaeb13bae9454f65488bd98d86dd101983a44d6e
parentb907f575aac95d94be3a556ce27bb4e9e7434934 (diff)
parent4caeddf881feda37e1795984007a0fecdef1f3ea (diff)
downloadpies-d20e8ff8fbef2e0864796ab75d1e870ccabce525.tar.gz
Merge pull request #38 from timothycrosley/feature/fix-issue-31
Update to use configparser instead of conflict with it
-rw-r--r--pies2overrides/configparser.py3
-rw-r--r--setup.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/pies2overrides/configparser.py b/pies2overrides/configparser.py
deleted file mode 100644
index 4ae03e6..0000000
--- a/pies2overrides/configparser.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import
-
-from ConfigParser import *
diff --git a/setup.py b/setup.py
index 0868339..25fd16b 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ install_requires = []
if sys.version_info[0] < 3:
install_requires += ['pies2overrides']
elif sys.version_info[1] < 2:
- install_requires += ['argparse']
+ install_requires += ['argparse', 'configparser']
if sys.version_info[0] < 3 or sys.version_info[1] < 4:
install_requires += ['enum34']