From 262bd98c160267a021a1068a12d4c66746506066 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 29 Oct 2012 12:23:53 +0100
Subject: [PATCH] Move Pykka version check back to import time

---
 mopidy/__init__.py | 18 +++++++++++++++++-
 mopidy/__main__.py | 14 --------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/mopidy/__init__.py b/mopidy/__init__.py
index 0b0be1a6..14c67b80 100644
--- a/mopidy/__init__.py
+++ b/mopidy/__init__.py
@@ -1,9 +1,25 @@
+# pylint: disable = E0611,F0401
+from distutils.version import StrictVersion as SV
+# pylint: enable = E0611,F0401
 import sys
+
+import pykka
+
+
 if not (2, 6) <= sys.version_info < (3,):
-    sys.exit(u'Mopidy requires Python >= 2.6, < 3')
+    sys.exit(
+        u'Mopidy requires Python >= 2.6, < 3, but found %s' %
+        '.'.join(map(str, sys.version_info[:3])))
+
+if (isinstance(pykka.__version__, basestring)
+        and not SV('1.0') <= SV(pykka.__version__) < SV('2.0')):
+    sys.exit(
+        u'Mopidy requires Pykka >= 1.0, < 2, but found %s' % pykka.__version__)
+
 
 __version__ = '0.8.0'
 
+
 from mopidy import settings as default_settings_module
 from mopidy.utils.settings import SettingsProxy
 settings = SettingsProxy(default_settings_module)
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 965cd9ba..75f847e4 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -1,6 +1,3 @@
-# pylint: disable = E0611,F0401
-from distutils.version import StrictVersion
-# pylint: enable = E0611,F0401
 import logging
 import optparse
 import os
@@ -10,8 +7,6 @@ import sys
 import gobject
 gobject.threads_init()
 
-import pykka
-
 
 # Extract any non-GStreamer arguments, and leave the GStreamer arguments for
 # processing by GStreamer. This needs to be done before GStreamer is imported,
@@ -45,7 +40,6 @@ logger = logging.getLogger('mopidy.main')
 
 
 def main():
-    check_dependencies()
     signal.signal(signal.SIGTERM, process.exit_handler)
     loop = gobject.MainLoop()
     options = parse_options()
@@ -73,14 +67,6 @@ def main():
         process.stop_remaining_actors()
 
 
-def check_dependencies():
-    pykka_required = '1.0'
-    if StrictVersion(pykka.__version__) < StrictVersion(pykka_required):
-        sys.exit(
-            u'Mopidy requires Pykka >= %s, but found %s' %
-            (pykka_required, pykka.__version__))
-
-
 def parse_options():
     parser = optparse.OptionParser(
         version=u'Mopidy %s' % versioning.get_version())