mv all 3rdparty modules to specific dir and hide urlgrabber

urlgrabber module was only used by pykickstart without self reference,
so it can be moved inside pykickstart module dir. And then it will
avoid the potential conflict with system installed urlgrabber module.

e.g. In Fedora system, yum will require urlgrabber > 3.9

diff --git a/mic/pykickstart/handlers/__init__.py b/mic/3rdparty/pykickstart/__init__.py
similarity index 100%
rename from mic/pykickstart/handlers/__init__.py
rename to mic/3rdparty/pykickstart/__init__.py

diff --git a/mic/pykickstart/base.py b/mic/3rdparty/pykickstart/base.py
similarity index 100%
rename from mic/pykickstart/base.py
rename to mic/3rdparty/pykickstart/base.py

diff --git a/mic/pykickstart/commands/__init__.py b/mic/3rdparty/pykickstart/commands/__init__.py
similarity index 100%
rename from mic/pykickstart/commands/__init__.py
rename to mic/3rdparty/pykickstart/commands/__init__.py

diff --git a/mic/pykickstart/commands/authconfig.py b/mic/3rdparty/pykickstart/commands/authconfig.py
similarity index 100%
rename from mic/pykickstart/commands/authconfig.py
rename to mic/3rdparty/pykickstart/commands/authconfig.py

diff --git a/mic/pykickstart/commands/autopart.py b/mic/3rdparty/pykickstart/commands/autopart.py
similarity index 100%
rename from mic/pykickstart/commands/autopart.py
rename to mic/3rdparty/pykickstart/commands/autopart.py

diff --git a/mic/pykickstart/commands/autostep.py b/mic/3rdparty/pykickstart/commands/autostep.py
similarity index 100%
rename from mic/pykickstart/commands/autostep.py
rename to mic/3rdparty/pykickstart/commands/autostep.py

diff --git a/mic/pykickstart/commands/bootloader.py b/mic/3rdparty/pykickstart/commands/bootloader.py
similarity index 100%
rename from mic/pykickstart/commands/bootloader.py
rename to mic/3rdparty/pykickstart/commands/bootloader.py

diff --git a/mic/pykickstart/commands/clearpart.py b/mic/3rdparty/pykickstart/commands/clearpart.py
similarity index 100%
rename from mic/pykickstart/commands/clearpart.py
rename to mic/3rdparty/pykickstart/commands/clearpart.py

diff --git a/mic/pykickstart/commands/device.py b/mic/3rdparty/pykickstart/commands/device.py
similarity index 100%
rename from mic/pykickstart/commands/device.py
rename to mic/3rdparty/pykickstart/commands/device.py

diff --git a/mic/pykickstart/commands/deviceprobe.py b/mic/3rdparty/pykickstart/commands/deviceprobe.py
similarity index 100%
rename from mic/pykickstart/commands/deviceprobe.py
rename to mic/3rdparty/pykickstart/commands/deviceprobe.py

diff --git a/mic/pykickstart/commands/displaymode.py b/mic/3rdparty/pykickstart/commands/displaymode.py
similarity index 100%
rename from mic/pykickstart/commands/displaymode.py
rename to mic/3rdparty/pykickstart/commands/displaymode.py

diff --git a/mic/pykickstart/commands/dmraid.py b/mic/3rdparty/pykickstart/commands/dmraid.py
similarity index 100%
rename from mic/pykickstart/commands/dmraid.py
rename to mic/3rdparty/pykickstart/commands/dmraid.py

diff --git a/mic/pykickstart/commands/driverdisk.py b/mic/3rdparty/pykickstart/commands/driverdisk.py
similarity index 100%
rename from mic/pykickstart/commands/driverdisk.py
rename to mic/3rdparty/pykickstart/commands/driverdisk.py

diff --git a/mic/pykickstart/commands/fcoe.py b/mic/3rdparty/pykickstart/commands/fcoe.py
similarity index 100%
rename from mic/pykickstart/commands/fcoe.py
rename to mic/3rdparty/pykickstart/commands/fcoe.py

diff --git a/mic/pykickstart/commands/firewall.py b/mic/3rdparty/pykickstart/commands/firewall.py
similarity index 100%
rename from mic/pykickstart/commands/firewall.py
rename to mic/3rdparty/pykickstart/commands/firewall.py

diff --git a/mic/pykickstart/commands/firstboot.py b/mic/3rdparty/pykickstart/commands/firstboot.py
similarity index 100%
rename from mic/pykickstart/commands/firstboot.py
rename to mic/3rdparty/pykickstart/commands/firstboot.py

diff --git a/mic/pykickstart/commands/group.py b/mic/3rdparty/pykickstart/commands/group.py
similarity index 100%
rename from mic/pykickstart/commands/group.py
rename to mic/3rdparty/pykickstart/commands/group.py

diff --git a/mic/pykickstart/commands/ignoredisk.py b/mic/3rdparty/pykickstart/commands/ignoredisk.py
similarity index 100%
rename from mic/pykickstart/commands/ignoredisk.py
rename to mic/3rdparty/pykickstart/commands/ignoredisk.py

diff --git a/mic/pykickstart/commands/interactive.py b/mic/3rdparty/pykickstart/commands/interactive.py
similarity index 100%
rename from mic/pykickstart/commands/interactive.py
rename to mic/3rdparty/pykickstart/commands/interactive.py

diff --git a/mic/pykickstart/commands/iscsi.py b/mic/3rdparty/pykickstart/commands/iscsi.py
similarity index 100%
rename from mic/pykickstart/commands/iscsi.py
rename to mic/3rdparty/pykickstart/commands/iscsi.py

diff --git a/mic/pykickstart/commands/iscsiname.py b/mic/3rdparty/pykickstart/commands/iscsiname.py
similarity index 100%
rename from mic/pykickstart/commands/iscsiname.py
rename to mic/3rdparty/pykickstart/commands/iscsiname.py

diff --git a/mic/pykickstart/commands/key.py b/mic/3rdparty/pykickstart/commands/key.py
similarity index 100%
rename from mic/pykickstart/commands/key.py
rename to mic/3rdparty/pykickstart/commands/key.py

diff --git a/mic/pykickstart/commands/keyboard.py b/mic/3rdparty/pykickstart/commands/keyboard.py
similarity index 100%
rename from mic/pykickstart/commands/keyboard.py
rename to mic/3rdparty/pykickstart/commands/keyboard.py

diff --git a/mic/pykickstart/commands/lang.py b/mic/3rdparty/pykickstart/commands/lang.py
similarity index 100%
rename from mic/pykickstart/commands/lang.py
rename to mic/3rdparty/pykickstart/commands/lang.py

diff --git a/mic/pykickstart/commands/langsupport.py b/mic/3rdparty/pykickstart/commands/langsupport.py
similarity index 100%
rename from mic/pykickstart/commands/langsupport.py
rename to mic/3rdparty/pykickstart/commands/langsupport.py

diff --git a/mic/pykickstart/commands/lilocheck.py b/mic/3rdparty/pykickstart/commands/lilocheck.py
similarity index 100%
rename from mic/pykickstart/commands/lilocheck.py
rename to mic/3rdparty/pykickstart/commands/lilocheck.py

diff --git a/mic/pykickstart/commands/logging.py b/mic/3rdparty/pykickstart/commands/logging.py
similarity index 100%
rename from mic/pykickstart/commands/logging.py
rename to mic/3rdparty/pykickstart/commands/logging.py

diff --git a/mic/pykickstart/commands/logvol.py b/mic/3rdparty/pykickstart/commands/logvol.py
similarity index 100%
rename from mic/pykickstart/commands/logvol.py
rename to mic/3rdparty/pykickstart/commands/logvol.py

diff --git a/mic/pykickstart/commands/mediacheck.py b/mic/3rdparty/pykickstart/commands/mediacheck.py
similarity index 100%
rename from mic/pykickstart/commands/mediacheck.py
rename to mic/3rdparty/pykickstart/commands/mediacheck.py

diff --git a/mic/pykickstart/commands/method.py b/mic/3rdparty/pykickstart/commands/method.py
similarity index 100%
rename from mic/pykickstart/commands/method.py
rename to mic/3rdparty/pykickstart/commands/method.py

diff --git a/mic/pykickstart/commands/monitor.py b/mic/3rdparty/pykickstart/commands/monitor.py
similarity index 100%
rename from mic/pykickstart/commands/monitor.py
rename to mic/3rdparty/pykickstart/commands/monitor.py

diff --git a/mic/pykickstart/commands/mouse.py b/mic/3rdparty/pykickstart/commands/mouse.py
similarity index 100%
rename from mic/pykickstart/commands/mouse.py
rename to mic/3rdparty/pykickstart/commands/mouse.py

diff --git a/mic/pykickstart/commands/multipath.py b/mic/3rdparty/pykickstart/commands/multipath.py
similarity index 100%
rename from mic/pykickstart/commands/multipath.py
rename to mic/3rdparty/pykickstart/commands/multipath.py

diff --git a/mic/pykickstart/commands/network.py b/mic/3rdparty/pykickstart/commands/network.py
similarity index 100%
rename from mic/pykickstart/commands/network.py
rename to mic/3rdparty/pykickstart/commands/network.py

diff --git a/mic/pykickstart/commands/partition.py b/mic/3rdparty/pykickstart/commands/partition.py
similarity index 100%
rename from mic/pykickstart/commands/partition.py
rename to mic/3rdparty/pykickstart/commands/partition.py

diff --git a/mic/pykickstart/commands/raid.py b/mic/3rdparty/pykickstart/commands/raid.py
similarity index 100%
rename from mic/pykickstart/commands/raid.py
rename to mic/3rdparty/pykickstart/commands/raid.py

diff --git a/mic/pykickstart/commands/reboot.py b/mic/3rdparty/pykickstart/commands/reboot.py
similarity index 100%
rename from mic/pykickstart/commands/reboot.py
rename to mic/3rdparty/pykickstart/commands/reboot.py

diff --git a/mic/pykickstart/commands/repo.py b/mic/3rdparty/pykickstart/commands/repo.py
similarity index 100%
rename from mic/pykickstart/commands/repo.py
rename to mic/3rdparty/pykickstart/commands/repo.py

diff --git a/mic/pykickstart/commands/rescue.py b/mic/3rdparty/pykickstart/commands/rescue.py
similarity index 100%
rename from mic/pykickstart/commands/rescue.py
rename to mic/3rdparty/pykickstart/commands/rescue.py

diff --git a/mic/pykickstart/commands/rootpw.py b/mic/3rdparty/pykickstart/commands/rootpw.py
similarity index 100%
rename from mic/pykickstart/commands/rootpw.py
rename to mic/3rdparty/pykickstart/commands/rootpw.py

diff --git a/mic/pykickstart/commands/selinux.py b/mic/3rdparty/pykickstart/commands/selinux.py
similarity index 100%
rename from mic/pykickstart/commands/selinux.py
rename to mic/3rdparty/pykickstart/commands/selinux.py

diff --git a/mic/pykickstart/commands/services.py b/mic/3rdparty/pykickstart/commands/services.py
similarity index 100%
rename from mic/pykickstart/commands/services.py
rename to mic/3rdparty/pykickstart/commands/services.py

diff --git a/mic/pykickstart/commands/skipx.py b/mic/3rdparty/pykickstart/commands/skipx.py
similarity index 100%
rename from mic/pykickstart/commands/skipx.py
rename to mic/3rdparty/pykickstart/commands/skipx.py

diff --git a/mic/pykickstart/commands/sshpw.py b/mic/3rdparty/pykickstart/commands/sshpw.py
similarity index 100%
rename from mic/pykickstart/commands/sshpw.py
rename to mic/3rdparty/pykickstart/commands/sshpw.py

diff --git a/mic/pykickstart/commands/timezone.py b/mic/3rdparty/pykickstart/commands/timezone.py
similarity index 100%
rename from mic/pykickstart/commands/timezone.py
rename to mic/3rdparty/pykickstart/commands/timezone.py

diff --git a/mic/pykickstart/commands/updates.py b/mic/3rdparty/pykickstart/commands/updates.py
similarity index 100%
rename from mic/pykickstart/commands/updates.py
rename to mic/3rdparty/pykickstart/commands/updates.py

diff --git a/mic/pykickstart/commands/upgrade.py b/mic/3rdparty/pykickstart/commands/upgrade.py
similarity index 100%
rename from mic/pykickstart/commands/upgrade.py
rename to mic/3rdparty/pykickstart/commands/upgrade.py

diff --git a/mic/pykickstart/commands/user.py b/mic/3rdparty/pykickstart/commands/user.py
similarity index 100%
rename from mic/pykickstart/commands/user.py
rename to mic/3rdparty/pykickstart/commands/user.py

diff --git a/mic/pykickstart/commands/vnc.py b/mic/3rdparty/pykickstart/commands/vnc.py
similarity index 100%
rename from mic/pykickstart/commands/vnc.py
rename to mic/3rdparty/pykickstart/commands/vnc.py

diff --git a/mic/pykickstart/commands/volgroup.py b/mic/3rdparty/pykickstart/commands/volgroup.py
similarity index 100%
rename from mic/pykickstart/commands/volgroup.py
rename to mic/3rdparty/pykickstart/commands/volgroup.py

diff --git a/mic/pykickstart/commands/xconfig.py b/mic/3rdparty/pykickstart/commands/xconfig.py
similarity index 100%
rename from mic/pykickstart/commands/xconfig.py
rename to mic/3rdparty/pykickstart/commands/xconfig.py

diff --git a/mic/pykickstart/commands/zerombr.py b/mic/3rdparty/pykickstart/commands/zerombr.py
similarity index 100%
rename from mic/pykickstart/commands/zerombr.py
rename to mic/3rdparty/pykickstart/commands/zerombr.py

diff --git a/mic/pykickstart/commands/zfcp.py b/mic/3rdparty/pykickstart/commands/zfcp.py
similarity index 100%
rename from mic/pykickstart/commands/zfcp.py
rename to mic/3rdparty/pykickstart/commands/zfcp.py

diff --git a/mic/pykickstart/constants.py b/mic/3rdparty/pykickstart/constants.py
similarity index 100%
rename from mic/pykickstart/constants.py
rename to mic/3rdparty/pykickstart/constants.py

diff --git a/mic/pykickstart/errors.py b/mic/3rdparty/pykickstart/errors.py
similarity index 100%
rename from mic/pykickstart/errors.py
rename to mic/3rdparty/pykickstart/errors.py

diff --git a/mic/pykickstart/__init__.py b/mic/3rdparty/pykickstart/handlers/__init__.py
similarity index 100%
rename from mic/pykickstart/__init__.py
rename to mic/3rdparty/pykickstart/handlers/__init__.py

diff --git a/mic/pykickstart/handlers/control.py b/mic/3rdparty/pykickstart/handlers/control.py
similarity index 100%
rename from mic/pykickstart/handlers/control.py
rename to mic/3rdparty/pykickstart/handlers/control.py

diff --git a/mic/pykickstart/handlers/f10.py b/mic/3rdparty/pykickstart/handlers/f10.py
similarity index 100%
rename from mic/pykickstart/handlers/f10.py
rename to mic/3rdparty/pykickstart/handlers/f10.py

diff --git a/mic/pykickstart/handlers/f11.py b/mic/3rdparty/pykickstart/handlers/f11.py
similarity index 100%
rename from mic/pykickstart/handlers/f11.py
rename to mic/3rdparty/pykickstart/handlers/f11.py

diff --git a/mic/pykickstart/handlers/f12.py b/mic/3rdparty/pykickstart/handlers/f12.py
similarity index 100%
rename from mic/pykickstart/handlers/f12.py
rename to mic/3rdparty/pykickstart/handlers/f12.py

diff --git a/mic/pykickstart/handlers/f13.py b/mic/3rdparty/pykickstart/handlers/f13.py
similarity index 100%
rename from mic/pykickstart/handlers/f13.py
rename to mic/3rdparty/pykickstart/handlers/f13.py

diff --git a/mic/pykickstart/handlers/f14.py b/mic/3rdparty/pykickstart/handlers/f14.py
similarity index 100%
rename from mic/pykickstart/handlers/f14.py
rename to mic/3rdparty/pykickstart/handlers/f14.py

diff --git a/mic/pykickstart/handlers/f15.py b/mic/3rdparty/pykickstart/handlers/f15.py
similarity index 100%
rename from mic/pykickstart/handlers/f15.py
rename to mic/3rdparty/pykickstart/handlers/f15.py

diff --git a/mic/pykickstart/handlers/f16.py b/mic/3rdparty/pykickstart/handlers/f16.py
similarity index 100%
rename from mic/pykickstart/handlers/f16.py
rename to mic/3rdparty/pykickstart/handlers/f16.py

diff --git a/mic/pykickstart/handlers/f7.py b/mic/3rdparty/pykickstart/handlers/f7.py
similarity index 100%
rename from mic/pykickstart/handlers/f7.py
rename to mic/3rdparty/pykickstart/handlers/f7.py

diff --git a/mic/pykickstart/handlers/f8.py b/mic/3rdparty/pykickstart/handlers/f8.py
similarity index 100%
rename from mic/pykickstart/handlers/f8.py
rename to mic/3rdparty/pykickstart/handlers/f8.py

diff --git a/mic/pykickstart/handlers/f9.py b/mic/3rdparty/pykickstart/handlers/f9.py
similarity index 100%
rename from mic/pykickstart/handlers/f9.py
rename to mic/3rdparty/pykickstart/handlers/f9.py

diff --git a/mic/pykickstart/handlers/fc3.py b/mic/3rdparty/pykickstart/handlers/fc3.py
similarity index 100%
rename from mic/pykickstart/handlers/fc3.py
rename to mic/3rdparty/pykickstart/handlers/fc3.py

diff --git a/mic/pykickstart/handlers/fc4.py b/mic/3rdparty/pykickstart/handlers/fc4.py
similarity index 100%
rename from mic/pykickstart/handlers/fc4.py
rename to mic/3rdparty/pykickstart/handlers/fc4.py

diff --git a/mic/pykickstart/handlers/fc5.py b/mic/3rdparty/pykickstart/handlers/fc5.py
similarity index 100%
rename from mic/pykickstart/handlers/fc5.py
rename to mic/3rdparty/pykickstart/handlers/fc5.py

diff --git a/mic/pykickstart/handlers/fc6.py b/mic/3rdparty/pykickstart/handlers/fc6.py
similarity index 100%
rename from mic/pykickstart/handlers/fc6.py
rename to mic/3rdparty/pykickstart/handlers/fc6.py

diff --git a/mic/pykickstart/handlers/rhel3.py b/mic/3rdparty/pykickstart/handlers/rhel3.py
similarity index 100%
rename from mic/pykickstart/handlers/rhel3.py
rename to mic/3rdparty/pykickstart/handlers/rhel3.py

diff --git a/mic/pykickstart/handlers/rhel4.py b/mic/3rdparty/pykickstart/handlers/rhel4.py
similarity index 100%
rename from mic/pykickstart/handlers/rhel4.py
rename to mic/3rdparty/pykickstart/handlers/rhel4.py

diff --git a/mic/pykickstart/handlers/rhel5.py b/mic/3rdparty/pykickstart/handlers/rhel5.py
similarity index 100%
rename from mic/pykickstart/handlers/rhel5.py
rename to mic/3rdparty/pykickstart/handlers/rhel5.py

diff --git a/mic/pykickstart/handlers/rhel6.py b/mic/3rdparty/pykickstart/handlers/rhel6.py
similarity index 100%
rename from mic/pykickstart/handlers/rhel6.py
rename to mic/3rdparty/pykickstart/handlers/rhel6.py

diff --git a/mic/pykickstart/ko.py b/mic/3rdparty/pykickstart/ko.py
similarity index 100%
rename from mic/pykickstart/ko.py
rename to mic/3rdparty/pykickstart/ko.py

diff --git a/mic/pykickstart/options.py b/mic/3rdparty/pykickstart/options.py
similarity index 100%
rename from mic/pykickstart/options.py
rename to mic/3rdparty/pykickstart/options.py

diff --git a/mic/pykickstart/parser.py b/mic/3rdparty/pykickstart/parser.py
similarity index 100%
rename from mic/pykickstart/parser.py
rename to mic/3rdparty/pykickstart/parser.py

diff --git a/mic/pykickstart/sections.py b/mic/3rdparty/pykickstart/sections.py
similarity index 100%
rename from mic/pykickstart/sections.py
rename to mic/3rdparty/pykickstart/sections.py

diff --git a/mic/urlgrabber/__init__.py b/mic/3rdparty/pykickstart/urlgrabber/__init__.py
similarity index 100%
rename from mic/urlgrabber/__init__.py
rename to mic/3rdparty/pykickstart/urlgrabber/__init__.py

diff --git a/mic/urlgrabber/byterange.py b/mic/3rdparty/pykickstart/urlgrabber/byterange.py
similarity index 100%
rename from mic/urlgrabber/byterange.py
rename to mic/3rdparty/pykickstart/urlgrabber/byterange.py

diff --git a/mic/urlgrabber/grabber.py b/mic/3rdparty/pykickstart/urlgrabber/grabber.py
similarity index 100%
rename from mic/urlgrabber/grabber.py
rename to mic/3rdparty/pykickstart/urlgrabber/grabber.py

diff --git a/mic/urlgrabber/keepalive.py b/mic/3rdparty/pykickstart/urlgrabber/keepalive.py
similarity index 100%
rename from mic/urlgrabber/keepalive.py
rename to mic/3rdparty/pykickstart/urlgrabber/keepalive.py

diff --git a/mic/urlgrabber/mirror.py b/mic/3rdparty/pykickstart/urlgrabber/mirror.py
similarity index 100%
rename from mic/urlgrabber/mirror.py
rename to mic/3rdparty/pykickstart/urlgrabber/mirror.py

diff --git a/mic/urlgrabber/progress.py b/mic/3rdparty/pykickstart/urlgrabber/progress.py
similarity index 100%
rename from mic/urlgrabber/progress.py
rename to mic/3rdparty/pykickstart/urlgrabber/progress.py

diff --git a/mic/urlgrabber/sslfactory.py b/mic/3rdparty/pykickstart/urlgrabber/sslfactory.py
similarity index 100%
rename from mic/urlgrabber/sslfactory.py
rename to mic/3rdparty/pykickstart/urlgrabber/sslfactory.py

diff --git a/mic/pykickstart/version.py b/mic/3rdparty/pykickstart/version.py
similarity index 100%
rename from mic/pykickstart/version.py
rename to mic/3rdparty/pykickstart/version.py

diff --git a/mic/__init__.py b/mic/__init__.py
index 92649b9..63c1d9c 100644 (file)
--- a/mic/__init__.py
+++ b/mic/__init__.py
@@ -1,3 +1,4 @@
 import os, sys
 
-sys.path.insert(0, os.path.dirname(__file__) or '.')
+cur_path = os.path.dirname(__file__) or '.'
+sys.path.insert(0, cur_path + '/3rdparty')

diff --git a/setup.py b/setup.py
index 27bf713..088df8e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -49,12 +49,12 @@ if sys.version_info[:2] > (2, 5):
 PACKAGES = [MOD_NAME,
             MOD_NAME + '/utils',
             MOD_NAME + '/imager',
-            MOD_NAME + '/urlgrabber',
             MOD_NAME + '/kickstart',
             MOD_NAME + '/kickstart/custom_commands',
-            MOD_NAME + '/pykickstart',
-            MOD_NAME + '/pykickstart/commands',
-            MOD_NAME + '/pykickstart/handlers',
+            MOD_NAME + '/3rdparty/pykickstart',
+            MOD_NAME + '/3rdparty/pykickstart/commands',
+            MOD_NAME + '/3rdparty/pykickstart/handlers',
+            MOD_NAME + '/3rdparty/pykickstart/urlgrabber',
            ]
 
 setup(name=MOD_NAME,