From: Loic Dachary Date: Mon, 15 Feb 2016 05:43:36 +0000 (+0700) Subject: ceph-disk: flake8 fixes X-Git-Tag: v10.1.0~381^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d476ff65d89f380ec7846095f49f1779ca477059;p=ceph.git ceph-disk: flake8 fixes Signed-off-by: Loic Dachary --- diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index 0e02cb46767b..944716743386 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -937,7 +937,7 @@ def get_osd_id(path): def get_ceph_user(): global CEPH_PREF_USER - if CEPH_PREF_USER != None: + if CEPH_PREF_USER is not None: try: pwd.getpwnam(CEPH_PREF_USER) return CEPH_PREF_USER @@ -951,10 +951,11 @@ def get_ceph_user(): except KeyError: return 'root' + def get_ceph_group(): global CEPH_PREF_GROUP - if CEPH_PREF_GROUP != None: + if CEPH_PREF_GROUP is not None: try: grp.getgrnam(CEPH_PREF_GROUP) return CEPH_PREF_GROUP @@ -4194,13 +4195,13 @@ def parse_args(argv): default='/etc/ceph', help=('directory in which ceph configuration files are found ' '(default /etc/ceph)'), - ) + ) parser.add_argument( '--setuser', metavar='USER', default=None, help='use the given user for subprocesses, rather than ceph or root' - ) + ) parser.add_argument( '--setgroup', metavar='GROUP',