From c1bdf93bd774a7a8553afd9fe3cabd25be0a2b2e Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Wed, 17 Jul 2013 14:21:30 -0400
Subject: Fixes for issues reported by pylint.

Fixed the warning W0202 - attributes defined outside init and
error E0202 - An instance attribute hiding a method (which is actually
an error in json.encoder.JSONEncoder line 157.)
---
 base/server/src/engine/pkihelper.py   | 8 ++++----
 base/server/src/engine/pkimanifest.py | 9 ++++++++-
 base/server/src/engine/pkiparser.py   | 2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'base/server/src/engine')

diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py
index 39a0b8b9e..6d47a902b 100644
--- a/base/server/src/engine/pkihelper.py
+++ b/base/server/src/engine/pkihelper.py
@@ -1041,7 +1041,7 @@ class Instance:
             raise
 
     def get_instance_status(self):
-        self.connection = pki.client.PKIConnection(
+        connection = pki.client.PKIConnection(
             protocol='https',
             hostname=self.master_dict['pki_hostname'],
             port=self.master_dict['pki_https_port'],
@@ -1049,7 +1049,7 @@ class Instance:
             accept='application/xml')
 
         try:
-            client = pki.system.SystemStatusClient(self.connection)
+            client = pki.system.SystemStatusClient(connection)
             response = client.getStatus()
             config.pki_log.debug(response,
                 extra=config.PKI_INDENTATION_LEVEL_3)
@@ -3070,14 +3070,14 @@ class ConfigClient:
         config.pki_log.info(log.PKI_CONFIG_CONFIGURING_PKI_DATA,
                              extra=config.PKI_INDENTATION_LEVEL_2)
 
-        self.connection = pki.client.PKIConnection(
+        connection = pki.client.PKIConnection(
             protocol='https',
             hostname=self.master_dict['pki_hostname'],
             port=self.master_dict['pki_https_port'],
             subsystem=self.master_dict['pki_subsystem_type'])
 
         try:
-            client = pki.system.SystemConfigClient(self.connection)
+            client = pki.system.SystemConfigClient(connection)
             response = client.configure(data)
 
             config.pki_log.debug(log.PKI_CONFIG_RESPONSE_STATUS + \
diff --git a/base/server/src/engine/pkimanifest.py b/base/server/src/engine/pkimanifest.py
index 09079b433..dea2af275 100644
--- a/base/server/src/engine/pkimanifest.py
+++ b/base/server/src/engine/pkimanifest.py
@@ -45,7 +45,14 @@ class Record(object):
                "acls",
 
     def __init__(self):
-        pass
+        self.name = None
+        self.type = None
+        self.user = None
+        self.group = None
+        self.uid = None
+        self.gid = None
+        self.permissions = None
+        self.acls = None
 
     def items(self):
         "dict style items"
diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py
index dfd48b00d..8dbed8deb 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
@@ -83,6 +83,8 @@ class PKIConfigParser:
                           help='directory prefix to specify local directory '
                                '[TEST ONLY]')
         self.indent = 0
+        self.ds_connection = None
+        self.sd_connection = None
 
         # Master and Slot dictionaries
         self.pki_master_dict = dict()
-- 
cgit