From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 11 Jul 2013 14:24:35 +0000 (+0200)
Subject: ceph_argparse.py: define some self.* in __init__
X-Git-Tag: v0.68~151^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b110dbc6e333fe5ddd4ef831d953aac9e40d705;p=ceph.git

ceph_argparse.py: define some self.* in __init__

Fix for "Attribute 'xy' defined outside __init__": add __init__
function to class and set some default values for the variables.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 5fce3140dad4..e99f72d7f0c2 100644
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -310,11 +310,13 @@ class CephName(CephArgtype):
 
     Also accept '*'
     """
+    def __init__(self):
+        self.nametype = None
+        self.nameid = None
+
     def valid(self, s, partial=False):
         if s == '*':
             self.val = s
-            self.nametype = None
-            self.nameid = None
             return
         if s.find('.') == -1:
             raise ArgumentFormat('CephName: no . in {0}'.format(s))
@@ -341,11 +343,13 @@ class CephOsdName(CephArgtype):
 
     osd.<id>, or <id>, or *, where id is a base10 int
     """
+    def __init__(self):
+        self.nametype = None
+        self.nameid = None
+
     def valid(self, s, partial=False):
         if s == '*':
             self.val = s
-            self.nametype = None
-            self.nameid = None
             return
         if s.find('.') != -1:
             t, i = s.split('.')