summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mick <dan.mick@inktank.com>2013-07-26 23:30:52 -0700
committerDan Mick <dan.mick@inktank.com>2013-08-05 11:21:19 -0700
commit28d58ebae52d9536b454d9221af52d2e447916d1 (patch)
treef729cd1d7c766ac566e766a18cf3056d835fd49e
parent55095d56ea9179ee3025719dc0c4e9a8d018df13 (diff)
downloadceph-28d58ebae52d9536b454d9221af52d2e447916d1.tar.gz
ceph.in, ceph_rest_api.py: import only used syms from ceph_argparse.py
This makes pyflakes/pylint happier and is better practice in general Signed-off-by: Dan Mick <dan.mick@inktank.com>
-rwxr-xr-xsrc/ceph.in5
-rwxr-xr-xsrc/pybind/ceph_rest_api.py8
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ceph.in b/src/ceph.in
index b9d3b04c94d..4dd9dfc37ae 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -54,7 +54,10 @@ import string
import struct
import subprocess
-from ceph_argparse import *
+from ceph_argparse import \
+ concise_sig, descsort, parse_json_funcsigs, \
+ matchnum, validate_command, find_cmd_target, \
+ send_command, json_command
# just a couple of globals
diff --git a/src/pybind/ceph_rest_api.py b/src/pybind/ceph_rest_api.py
index 59e3f60a3a7..421cc59edcc 100755
--- a/src/pybind/ceph_rest_api.py
+++ b/src/pybind/ceph_rest_api.py
@@ -1,20 +1,20 @@
#!/usr/bin/python
# vim: ts=4 sw=4 smarttab expandtab
-import collections
-import contextlib
import errno
import json
import logging
import logging.handlers
-import os
import rados
import textwrap
import xml.etree.ElementTree
import xml.sax.saxutils
import flask
-from ceph_argparse import *
+from ceph_argparse import \
+ ArgumentError, CephPgid, CephOsdName, CephChoices, CephPrefix, \
+ concise_sig, descsort, parse_funcsig, parse_json_funcsigs, \
+ validate, json_command
#
# Globals and defaults