Removed 'Assert False' that was mistakingly left in cert.py; small cleanup in cert.py and ra.py imports

2 files changed, 4 insertions, 8 deletions

diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py
index 96e2667bc..2ccc43a7a 100644
--- a/ipalib/plugins/cert.py
+++ b/ipalib/plugins/cert.py
@@ -23,13 +23,11 @@ Command plugins for IPA-RA certificate operations.
 """
 
 from ipalib import api, SkipPluginModule
-
 if api.env.enable_ra is not True:
-    raise SkipPluginModule(reason='env.enable_ra=%r' % (api.env.enable_ra,))
-
+    # In this case, abort loading this plugin module...
+    raise SkipPluginModule(reason='env.enable_ra is not True')
 from ipalib import Command, Str, Int
 
-assert False
 
 class cert_request(Command):
     """
diff --git a/ipaserver/plugins/ra.py b/ipaserver/plugins/ra.py
index 471276c33..a52909f68 100644
--- a/ipaserver/plugins/ra.py
+++ b/ipaserver/plugins/ra.py
@@ -32,10 +32,9 @@ certificates via the following methods:
 """
 
 from ipalib import api, SkipPluginModule
-
 if api.env.enable_ra is not True:
-    raise SkipPluginModule(reason='env.enable_ra=%r' % (api.env.enable_ra,))
-
+    # In this case, abort loading this plugin module...
+    raise SkipPluginModule(reason='env.enable_ra is not True')
 import os, stat, subprocess
 import array
 import errno
@@ -44,7 +43,6 @@ from httplib import HTTPConnection
 from urllib import urlencode, quote
 from socket import gethostname
 import socket
-
 from ipalib import Backend
 from ipalib.errors2 import NetworkError
 from ipaserver import servercore