diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-02 07:19:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-02 07:19:28 +0000 |
| commit | d0520c2754ac84883ca44ec939837af31239ae47 (patch) | |
| tree | 8922b816f484ed5d4573276e67ddf2027f241a6a | |
| parent | f3d1c06c37c23f3e35d1a5e68207b7e3e453307a (diff) | |
| parent | 1d772e70ffe780b3451d7544044695e3901a14e3 (diff) | |
| download | gear-d0520c2754ac84883ca44ec939837af31239ae47.tar.gz | |
Merge "Switch to six for configparser"
| -rw-r--r-- | gear/cmd/geard.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gear/cmd/geard.py b/gear/cmd/geard.py index e270b39..762d956 100644 --- a/gear/cmd/geard.py +++ b/gear/cmd/geard.py @@ -13,7 +13,6 @@ # under the License. import argparse -import ConfigParser import daemon import extras import gear @@ -24,6 +23,9 @@ import pbr.version import signal import sys +from six.moves import configparser as ConfigParser + + pid_file_module = extras.try_imports(['daemon.pidlockfile', 'daemon.pidfile']) diff --git a/requirements.txt b/requirements.txt index afeea28..1e6a9e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ pbr>=0.6,!=0.7,<1.0 +six>=1.5.2 extras python-daemon>=2.0.4 |