Rename ipa-python directory to ipapython so it is a real python library

We used to install it as ipa, now installing it as ipapython. The rpm
is still ipa-python.

9 files changed, 16 insertions, 16 deletions

diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 5badf8603..08b781d25 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -25,8 +25,8 @@ import socket
 import logging
 
 import service
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 
 def check_inst():
     # So far this file is always present in both RHEL5 and Fedora if all the necessary
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 8cb1d0883..e9061fe11 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -23,8 +23,8 @@ import errno
 import tempfile
 import shutil
 
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 
 CA_SERIALNO="/var/lib/ipa/ca_serialno"
 
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index bc6393f29..6ba88ecd9 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -29,7 +29,7 @@ import time
 import tempfile
 import stat
 
-from ipa import ipautil
+from ipapython import ipautil
 
 import service
 import installutils
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index f5a903b30..d4cebfac9 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -32,8 +32,8 @@ import service
 import certs
 import dsinstance
 import installutils
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 
 HTTPD_DIR = "/etc/httpd"
 SSL_CONF = HTTPD_DIR + "/conf.d/ssl.conf"
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 563b168e8..f5e04636c 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -29,8 +29,8 @@ import time
 import struct
 import fcntl
 
-from ipa import ipautil
-from ipa import dnsclient
+from ipapython import ipautil
+from ipapython import dnsclient
 
 def get_fqdn():
     fqdn = ""
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 4efa4e9b5..50df2968c 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -32,8 +32,8 @@ import shutil
 
 import service
 import installutils
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 from ipalib import util
 from ipalib import errors2
 
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 3690b75bb..ed08751c0 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -27,7 +27,7 @@ UPDATES_DIR="/usr/share/ipa/updates/"
 import sys
 from ipaserver.install import installutils
 from ipaserver import ipaldap
-from ipa import entity, ipautil
+from ipapython import entity, ipautil
 from ipalib import util
 from ipalib import errors, errors2
 import ldap
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
index e2ec60650..3f76551e8 100644
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -21,8 +21,8 @@ import shutil
 import logging
 
 import service
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 
 class NTPInstance(service.Service):
     def __init__(self, fstore=None):
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index b9f6c505d..e091af381 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -18,8 +18,8 @@
 #
 
 import logging, sys
-from ipa import sysrestore
-from ipa import ipautil
+from ipapython import sysrestore
+from ipapython import ipautil
 
 
 def stop(service_name):