Fixing all the imports \o/

diff --git a/mdk/backup.py b/mdk/backup.py
index ad3b493..856e9f1 100644 (file)
--- a/mdk/backup.py
+++ b/mdk/backup.py
@@ -28,11 +28,11 @@ import time
 import logging
 from distutils.dir_util import copy_tree
 
-from tools import chmodRecursive
-from db import DB
-from config import Conf
-from workplace import Workplace
-from exceptions import *
+from .tools import chmodRecursive
+from .db import DB
+from .config import Conf
+from .workplace import Workplace
+from .exceptions import *
 
 C = Conf()
 jason = 'info.json'

diff --git a/mdk/command.py b/mdk/command.py
index 1eecfdb..34d29cb 100644 (file)
--- a/mdk/command.py
+++ b/mdk/command.py
@@ -73,8 +73,8 @@ class Command(object):
     @property
     def Wp(self):
         if not self.__Wp:
-            import workplace
-            self.__Wp = workplace.Workplace()
+            from .workplace import Workplace
+            self.__Wp = Workplace()
         return self.__Wp
 
 

diff --git a/mdk/commands/__init__.py b/mdk/commands/__init__.py
index 44176de..3461bea 100644 (file)
--- a/mdk/commands/__init__.py
+++ b/mdk/commands/__init__.py
@@ -26,7 +26,7 @@ http://github.com/FMCorz/mdk
 def getCommand(cmd):
     """Lazy loading of a command class. Millseconds saved, hurray!"""
     cls = cmd.capitalize() + 'Command'
-    return getattr(getattr(getattr(__import__('lib.%s.%s' % ('commands', cmd)), 'commands'), cmd), cls)
+    return getattr(getattr(getattr(__import__('mdk.%s.%s' % ('commands', cmd)), 'commands'), cmd), cls)
 
 commandsList = [
     'alias',

diff --git a/mdk/commands/alias.py b/mdk/commands/alias.py
index 07e5c47..8b4091d 100644 (file)
--- a/mdk/commands/alias.py
+++ b/mdk/commands/alias.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import argparse
-from lib.command import Command
+from ..command import Command
 
 
 class AliasCommand(Command):

diff --git a/mdk/commands/backport.py b/mdk/commands/backport.py
index dac4cd4..e3b36b0 100644 (file)
--- a/mdk/commands/backport.py
+++ b/mdk/commands/backport.py
@@ -23,9 +23,9 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib import tools, css, jira
-from lib.command import Command
-from lib.tools import yesOrNo
+from .. import tools, css, jira
+from ..command import Command
+from ..tools import yesOrNo
 
 
 class BackportCommand(Command):

diff --git a/mdk/commands/backup.py b/mdk/commands/backup.py
index 60dd10f..1323022 100644 (file)
--- a/mdk/commands/backup.py
+++ b/mdk/commands/backup.py
@@ -25,9 +25,9 @@ http://github.com/FMCorz/mdk
 import time
 import logging
 from distutils.errors import DistutilsFileError
-from lib.command import Command
-from lib import backup
-from lib.exceptions import *
+from .. import backup
+from ..command import Command
+from ..exceptions import *
 
 
 class BackupCommand(Command):

diff --git a/mdk/commands/behat.py b/mdk/commands/behat.py
index 99c8be8..8bf8c9f 100644 (file)
--- a/mdk/commands/behat.py
+++ b/mdk/commands/behat.py
@@ -28,8 +28,8 @@ import re
 import logging
 import gzip
 from time import sleep
-from lib.command import Command
-from lib.tools import process, ProcessInThread, downloadProcessHook
+from ..command import Command
+from ..tools import process, ProcessInThread, downloadProcessHook
 
 
 class BehatCommand(Command):

diff --git a/mdk/commands/config.py b/mdk/commands/config.py
index c37cb43..b0949a9 100644 (file)
--- a/mdk/commands/config.py
+++ b/mdk/commands/config.py
@@ -23,9 +23,9 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
-from lib.tools import launchEditor, yesOrNo
-from lib.config import ConfigObject, ConfigFileCouldNotBeLoaded
+from ..command import Command
+from ..tools import launchEditor, yesOrNo
+from ..config import ConfigObject, ConfigFileCouldNotBeLoaded
 
 
 class ConfigCommand(Command):

diff --git a/mdk/commands/create.py b/mdk/commands/create.py
index 59074d8..ba85f9c 100644 (file)
--- a/mdk/commands/create.py
+++ b/mdk/commands/create.py
@@ -25,10 +25,10 @@ http://github.com/FMCorz/mdk
 import re
 import logging
 
-from lib.db import DB
-from lib.command import Command
-from lib.tools import yesOrNo
-from lib.exceptions import CreateException, InstallException
+from ..db import DB
+from ..command import Command
+from ..tools import yesOrNo
+from ..exceptions import CreateException, InstallException
 
 
 class CreateCommand(Command):

diff --git a/mdk/commands/css.py b/mdk/commands/css.py
index ffb6c00..d46e82e 100644 (file)
--- a/mdk/commands/css.py
+++ b/mdk/commands/css.py
@@ -27,8 +27,8 @@ import os
 import time
 import watchdog.events
 import watchdog.observers
-from lib.command import Command
-from lib import css
+from .. import css
+from ..command import Command
 
 
 class CssCommand(Command):

diff --git a/mdk/commands/doctor.py b/mdk/commands/doctor.py
index 5112f11..b5d8139 100644 (file)
--- a/mdk/commands/doctor.py
+++ b/mdk/commands/doctor.py
@@ -26,9 +26,9 @@ import os
 import shutil
 import imp
 import subprocess
-from lib import git
-from lib.command import Command
-from lib.tools import mkdir, resolveEditor
+from .. import git
+from ..command import Command
+from ..tools import mkdir, resolveEditor
 
 
 class DoctorCommand(Command):

diff --git a/mdk/commands/fix.py b/mdk/commands/fix.py
index d8a67be..b6e9232 100644 (file)
--- a/mdk/commands/fix.py
+++ b/mdk/commands/fix.py
@@ -24,7 +24,7 @@ http://github.com/FMCorz/mdk
 
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class FixCommand(Command):

diff --git a/mdk/commands/info.py b/mdk/commands/info.py
index dcc514a..ac2051b 100644 (file)
--- a/mdk/commands/info.py
+++ b/mdk/commands/info.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class InfoCommand(Command):

diff --git a/mdk/commands/init.py b/mdk/commands/init.py
index 48e3b4a..472b657 100644 (file)
--- a/mdk/commands/init.py
+++ b/mdk/commands/init.py
@@ -29,8 +29,8 @@ import pwd
 import subprocess
 import logging
 
-from lib.command import Command
-from lib.tools import question, get_current_user, mkdir
+from ..command import Command
+from ..tools import question, get_current_user, mkdir
 
 
 class InitCommand(Command):
@@ -112,7 +112,7 @@ class InitCommand(Command):
             pass
 
         # Loading the configuration.
-        from lib.config import Conf as Config
+        from ..config import Conf as Config
         C = Config(userfile=userconfigfile)
 
         # Asks the user what needs to be asked.

diff --git a/mdk/commands/install.py b/mdk/commands/install.py
index 99f539e..5e595e0 100644 (file)
--- a/mdk/commands/install.py
+++ b/mdk/commands/install.py
@@ -24,9 +24,9 @@ http://github.com/FMCorz/mdk
 
 import os
 import logging
-from lib import db
-from lib.command import Command
-from lib.tools import mkdir
+from .. import db
+from ..command import Command
+from ..tools import mkdir
 
 DB = db.DB
 

diff --git a/mdk/commands/js.py b/mdk/commands/js.py
index e60fdb6..6401218 100644 (file)
--- a/mdk/commands/js.py
+++ b/mdk/commands/js.py
@@ -27,8 +27,8 @@ import os
 import time
 import watchdog.events
 import watchdog.observers
-from lib.command import Command
-from lib import js, plugins
+from ..command import Command
+from .. import js, plugins
 
 
 class JsCommand(Command):

diff --git a/mdk/commands/phpunit.py b/mdk/commands/phpunit.py
index ffd4aca..5e7fdb3 100644 (file)
--- a/mdk/commands/phpunit.py
+++ b/mdk/commands/phpunit.py
@@ -26,8 +26,8 @@ import logging
 import os
 import gzip
 import urllib
-from lib.command import Command
-from lib.tools import process
+from ..command import Command
+from ..tools import process
 
 
 class PhpunitCommand(Command):

diff --git a/mdk/commands/plugin.py b/mdk/commands/plugin.py
index 5a78abc..f600ab2 100644 (file)
--- a/mdk/commands/plugin.py
+++ b/mdk/commands/plugin.py
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 http://github.com/FMCorz/mdk
 """
 
-from lib.plugins import *
-from lib.command import Command
+from ..plugins import *
+from ..command import Command
 
 
 class PluginCommand(Command):

diff --git a/mdk/commands/pull.py b/mdk/commands/pull.py
index aca31d5..2656ce1 100644 (file)
--- a/mdk/commands/pull.py
+++ b/mdk/commands/pull.py
@@ -26,9 +26,9 @@ import re
 import os
 import logging
 from datetime import datetime
-from lib import tools, jira, fetch
-from lib.command import Command
-from lib.tools import question
+from .. import tools, jira, fetch
+from ..command import Command
+from ..tools import question
 
 
 class PullCommand(Command):

diff --git a/mdk/commands/purge.py b/mdk/commands/purge.py
index 6cf1a38..35a9d73 100644 (file)
--- a/mdk/commands/purge.py
+++ b/mdk/commands/purge.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class PurgeCommand(Command):

diff --git a/mdk/commands/push.py b/mdk/commands/push.py
index b7f7ad0..161bce8 100644 (file)
--- a/mdk/commands/push.py
+++ b/mdk/commands/push.py
@@ -23,10 +23,9 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-import re
-from lib import tools, jira
-from lib.command import Command
-from lib.tools import getMDLFromCommitMessage
+from .. import tools, jira
+from ..command import Command
+from ..tools import getMDLFromCommitMessage
 
 
 class PushCommand(Command):

diff --git a/mdk/commands/rebase.py b/mdk/commands/rebase.py
index 2e236a8..9f024c1 100644 (file)
--- a/mdk/commands/rebase.py
+++ b/mdk/commands/rebase.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class RebaseCommand(Command):

diff --git a/mdk/commands/remove.py b/mdk/commands/remove.py
index 4b5687f..9175df6 100644 (file)
--- a/mdk/commands/remove.py
+++ b/mdk/commands/remove.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class RemoveCommand(Command):

diff --git a/mdk/commands/run.py b/mdk/commands/run.py
index 4cba201..6750752 100644 (file)
--- a/mdk/commands/run.py
+++ b/mdk/commands/run.py
@@ -23,8 +23,8 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
-from lib.scripts import Scripts
+from ..command import Command
+from ..scripts import Scripts
 
 
 class RunCommand(Command):

diff --git a/mdk/commands/tracker.py b/mdk/commands/tracker.py
index 287bb7e..4817bb7 100644 (file)
--- a/mdk/commands/tracker.py
+++ b/mdk/commands/tracker.py
@@ -25,9 +25,9 @@ http://github.com/FMCorz/mdk
 from datetime import datetime
 import textwrap
 import re
-from lib.command import Command
-from lib.jira import Jira
-from lib.tools import parseBranch
+from ..command import Command
+from ..jira import Jira
+from ..tools import parseBranch
 
 
 class TrackerCommand(Command):

diff --git a/mdk/commands/uninstall.py b/mdk/commands/uninstall.py
index ec17c5b..c8d0692 100644 (file)
--- a/mdk/commands/uninstall.py
+++ b/mdk/commands/uninstall.py
@@ -23,7 +23,7 @@ http://github.com/FMCorz/mdk
 """
 
 import logging
-from lib.command import Command
+from ..command import Command
 
 
 class UninstallCommand(Command):

diff --git a/mdk/commands/update.py b/mdk/commands/update.py
index 7462633..648c393 100644 (file)
--- a/mdk/commands/update.py
+++ b/mdk/commands/update.py
@@ -24,8 +24,8 @@ http://github.com/FMCorz/mdk
 
 import sys
 import logging
-from lib.command import Command
-from lib.exceptions import UpgradeNotAllowed
+from ..command import Command
+from ..exceptions import UpgradeNotAllowed
 
 
 class UpdateCommand(Command):

diff --git a/mdk/commands/upgrade.py b/mdk/commands/upgrade.py
index 4684dae..07aaac1 100644 (file)
--- a/mdk/commands/upgrade.py
+++ b/mdk/commands/upgrade.py
@@ -24,8 +24,8 @@ http://github.com/FMCorz/mdk
 
 import sys
 import logging
-from lib.command import Command
-from lib.exceptions import UpgradeNotAllowed
+from ..command import Command
+from ..exceptions import UpgradeNotAllowed
 
 class UpgradeCommand(Command):
 

diff --git a/mdk/css.py b/mdk/css.py
index 07b3726..b1f86da 100644 (file)
--- a/mdk/css.py
+++ b/mdk/css.py
@@ -24,8 +24,8 @@ http://github.com/FMCorz/mdk
 
 import logging
 import os
-from tools import process
-from config import Conf
+from .tools import process
+from .config import Conf
 
 C = Conf()
 

diff --git a/mdk/jira.py b/mdk/jira.py
index 177a637..32d0429 100644 (file)
--- a/mdk/jira.py
+++ b/mdk/jira.py
@@ -23,8 +23,8 @@ http://github.com/FMCorz/mdk
 """
 
 import json
-from tools import question
-from config import Conf
+from .tools import question
+from .config import Conf
 from urlparse import urlparse
 from datetime import datetime
 import re

diff --git a/mdk/js.py b/mdk/js.py
index ba1b381..d741892 100644 (file)
--- a/mdk/js.py
+++ b/mdk/js.py
@@ -24,9 +24,9 @@ http://github.com/FMCorz/mdk
 
 import logging
 import os
-from tools import process
-from config import Conf
-from plugins import PluginManager
+from .tools import process
+from .config import Conf
+from .plugins import PluginManager
 
 C = Conf()
 

diff --git a/mdk/mdk.py b/mdk/mdk.py
index aee7c22..bcd5471 100755 (executable)
--- a/mdk/mdk.py
+++ b/mdk/mdk.py
@@ -27,11 +27,11 @@ import argparse
 import os
 import re
 import logging
-from lib.command import CommandRunner
-from lib.commands import getCommand, commandsList
-from lib.config import Conf
-from lib.tools import process
-from version import __version__
+from .command import CommandRunner
+from .commands import getCommand, commandsList
+from .config import Conf
+from .tools import process
+from .version import __version__
 
 C = Conf()
 

diff --git a/mdk/moodle.py b/mdk/moodle.py
index 365ffef..85a2a34 100644 (file)
--- a/mdk/moodle.py
+++ b/mdk/moodle.py
@@ -28,13 +28,13 @@ import logging
 import shutil
 from tempfile import gettempdir
 
-from tools import getMDLFromCommitMessage, mkdir, process, parseBranch
-from db import DB
-from config import Conf
-from git import Git, GitException
-from exceptions import InstallException, UpgradeNotAllowed
-from jira import Jira, JiraException
-from scripts import Scripts
+from .tools import getMDLFromCommitMessage, mkdir, process, parseBranch
+from .db import DB
+from .config import Conf
+from .git import Git, GitException
+from .exceptions import InstallException, UpgradeNotAllowed
+from .jira import Jira, JiraException
+from .scripts import Scripts
 
 C = Conf()
 

diff --git a/mdk/plugins.py b/mdk/plugins.py
index 6dbd874..e3a7461 100644 (file)
--- a/mdk/plugins.py
+++ b/mdk/plugins.py
@@ -31,8 +31,8 @@ import zipfile
 import re
 import shutil
 from tempfile import gettempdir
-from config import Conf
-import tools
+from .config import Conf
+from . import tools
 
 C = Conf()
 

diff --git a/mdk/scripts.py b/mdk/scripts.py
index ee73667..94066a6 100644 (file)
--- a/mdk/scripts.py
+++ b/mdk/scripts.py
@@ -26,9 +26,9 @@ import os
 import shutil
 import stat
 import logging
-from tools import process
-from config import Conf
-from exceptions import ScriptNotFound, ConflictInScriptName, UnsupportedScript
+from .tools import process
+from .config import Conf
+from .exceptions import ScriptNotFound, ConflictInScriptName, UnsupportedScript
 
 C = Conf()
 

diff --git a/mdk/tools.py b/mdk/tools.py
index 4ae461c..e277113 100644 (file)
--- a/mdk/tools.py
+++ b/mdk/tools.py
@@ -33,7 +33,7 @@ import getpass
 import logging
 import hashlib
 import tempfile
-from lib.config import Conf
+from .config import Conf
 
 C = Conf()
 

diff --git a/mdk/workplace.py b/mdk/workplace.py
index b598f12..7a5f226 100644 (file)
--- a/mdk/workplace.py
+++ b/mdk/workplace.py
@@ -25,11 +25,11 @@ http://github.com/FMCorz/mdk
 import os
 import shutil
 import logging
-from tools import mkdir, process, stableBranch
-from exceptions import CreateException
-from config import Conf
-import git
-import moodle
+from .tools import mkdir, process, stableBranch
+from .exceptions import CreateException
+from .config import Conf
+from . import git
+from . import moodle
 
 C = Conf()