Had to rename celerymon -> celerymonitor because of import conflicts …

…(Python relative imports by default is really really stupid!)
thegreatape · Dec 7, 2009 · fb2dce0 · fb2dce0
1 parent c0396af
commit fb2dce0
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 8 deletions.
diff --git a/bin/celerymon b/bin/celerymon
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys
-from celerymon.bin.celerymon import run_monitor, parse_options
+from celerymonitor.bin.celerymond import run_monitor, parse_options
 
 if __name__ == "__main__":
     options = parse_options(sys.argv[1:])

diff --git a/celerymon/__init__.py → celerymonitor/__init__.py b/celerymon/__init__.py → celerymonitor/__init__.py
diff --git a/celerymon/bin/__init__ → celerymonitor/bin/__init__ b/celerymon/bin/__init__ → celerymonitor/bin/__init__
diff --git a/celerymon/bin/__init__.py → celerymonitor/bin/__init__.py b/celerymon/bin/__init__.py → celerymonitor/bin/__init__.py
diff --git a/celerymon/bin/celerymon.py → celerymonitor/bin/celerymond.py b/celerymon/bin/celerymon.py → celerymonitor/bin/celerymond.py
@@ -57,7 +57,7 @@
 from celery.loaders import settings
 from celery.messaging import get_connection_info
 
-from celerymon.service import MonitorService
+from celerymonitor.service import MonitorService
 
 STARTUP_INFO_FMT = """
 Configuration ->

diff --git a/celerymon/handlers/__init__.py → celerymonitor/handlers/__init__.py b/celerymon/handlers/__init__.py → celerymonitor/handlers/__init__.py
diff --git a/celerymon/handlers/api.py → celerymonitor/handlers/api.py b/celerymon/handlers/api.py → celerymonitor/handlers/api.py
@@ -4,7 +4,7 @@
 from tornado.web import RequestHandler, Application
 
 from celery.task import revoke
-from celerymon.state import monitor_state
+from celerymonitor.state import monitor_state
 
 
 def JSON(fun):

diff --git a/celerymon/management/__init__.py → celerymonitor/management/__init__.py b/celerymon/management/__init__.py → celerymonitor/management/__init__.py
diff --git a/celerymon/management/commands/__init__.py → ...rymonitor/management/commands/__init__.py b/celerymon/management/commands/__init__.py → ...rymonitor/management/commands/__init__.py
diff --git a/celerymon/management/commands/celerymon.py → ...ymonitor/management/commands/celerymon.py b/celerymon/management/commands/celerymon.py → ...ymonitor/management/commands/celerymon.py
@@ -5,7 +5,7 @@
 """
 from django.core.management.base import BaseCommand
 
-from celerymon.bin.celerymon import run_monitor, OPTION_LIST
+from celerymonitor.bin.celerymond import run_monitor, OPTION_LIST
 
 
 class Command(BaseCommand):

diff --git a/celerymon/service.py → celerymonitor/service.py b/celerymon/service.py → celerymonitor/service.py
@@ -1,8 +1,8 @@
 from carrot.connection import DjangoBrokerConnection
 from celery.events import EventReceiver
 
-from celerymon.state import monitor_state
-from celerymon.web import WebServerThread
+from celerymonitor.state import monitor_state
+from celerymonitor.web import WebServerThread
 
 
 class MonitorListener(object):

diff --git a/celerymon/state.py → celerymonitor/state.py b/celerymon/state.py → celerymonitor/state.py
diff --git a/celerymon/web.py → celerymonitor/web.py b/celerymon/web.py → celerymonitor/web.py
@@ -4,7 +4,7 @@
 from tornado import ioloop
 from tornado.web import Application
 
-from celerymon.handlers import api
+from celerymonitor.handlers import api
 
 
 class Site(Application):

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
     use_setuptools()
     from setuptools import setup, find_packages, Command
 
-import celerymon as distmeta
+import celerymonitor as distmeta
 
 
 class RunTests(Command):