Fixes import errors in the framework cause by recent API version changes.
Fix #796
Pavel
>From 3532c0f551edc79e63843ee112dee097dfb6aadf Mon Sep 17 00:00:00 2001
From: Pavel Zuna <pz...@redhat.com>
Date: Tue, 18 Jan 2011 12:35:59 -0500
Subject: [PATCH] Fix import API_VERSION import error.
Fix #796
---
ipalib/cli.py | 2 +-
ipalib/frontend.py | 2 +-
ipalib/plugins/batch.py | 2 +-
ipalib/plugins/ping.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ipalib/cli.py b/ipalib/cli.py
index c634d49..54ab1c4 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -49,7 +49,7 @@ from errors import PublicError, CommandError, HelpError, InternalError, NoSuchNa
from constants import CLI_TAB
from parameters import Password, Bytes, File
from text import _
-from ipapython.version import API_VERSION
+from ipapython.version import VERSION as API_VERSION
def to_cli(name):
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index eeed398..e514932 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -33,7 +33,7 @@ from text import _, ngettext
from errors import ZeroArgumentError, MaxArgumentError, OverlapError, RequiresRoot, VersionError, RequirementError
from errors import InvocationError
from constants import TYPE_ERROR
-from ipapython.version import API_VERSION
+from ipapython.version import VERSION as API_VERSION
from distutils import version
diff --git a/ipalib/plugins/batch.py b/ipalib/plugins/batch.py
index f6f662f..deaee5b 100644
--- a/ipalib/plugins/batch.py
+++ b/ipalib/plugins/batch.py
@@ -51,7 +51,7 @@ from ipalib import Str, List
from ipalib.output import Output
from ipalib import output
from ipalib.text import _
-from ipapython.version import API_VERSION
+from ipapython.version import VERSION as API_VERSION
class batch(Command):
INTERNAL = True
diff --git a/ipalib/plugins/ping.py b/ipalib/plugins/ping.py
index c2f9b6b..db021b9 100644
--- a/ipalib/plugins/ping.py
+++ b/ipalib/plugins/ping.py
@@ -23,7 +23,7 @@ Ping the remote IPA server
from ipalib import api
from ipalib import Command
from ipalib import output
-from ipapython.version import VERSION, API_VERSION
+from ipapython.version import VERSION as API_VERSION
class ping(Command):
"""
--
1.7.1.1
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
