summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2008-10-27 01:35:40 -0600
committerJason Gerard DeRose <jderose@redhat.com>2008-10-27 01:35:40 -0600
commitd76202fea37e63fbc660ed2cf2059f455b8e2213 (patch)
tree90144648d8c0904c048c6e61e54ec4f9543b7689 /ipalib
parent25a7df9615058372b81a41df6baa2c4692df0063 (diff)
downloadfreeipa-d76202fea37e63fbc660ed2cf2059f455b8e2213.tar.gz
freeipa-d76202fea37e63fbc660ed2cf2059f455b8e2213.tar.xz
freeipa-d76202fea37e63fbc660ed2cf2059f455b8e2213.zip
API.env is now an Env instance rather than an Environment instance
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/frontend.py2
-rw-r--r--ipalib/plugable.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index d918dd833..62a503cc5 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -668,7 +668,7 @@ class Command(plugable.Plugin):
on the nearest IPA server and the actual work this command
performs is executed remotely.
"""
- if self.api.env.server_context:
+ if self.api.env.in_server:
target = self.execute
else:
target = self.forward
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 367211576..594849896 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -29,7 +29,8 @@ import re
import inspect
import errors
from errors import check_type, check_isinstance
-from config import Environment
+from config import Environment, Env
+import constants
import util
@@ -713,7 +714,7 @@ class API(DictProxy):
self.__d = dict()
self.__done = set()
self.register = Registrar(*allowed)
- self.env = Environment()
+ self.env = Env
super(API, self).__init__(self.__d)
def __doing(self, name):