Fix more fallout from daemon.py -> main.py.

docs/pulsar.rst

@@ -26,18 +26,18 @@ pulsar.core module
     :undoc-members:
     :show-inheritance:
 
-pulsar.daemon module
---------------------
+pulsar.locks module
+-------------------
 
-.. automodule:: pulsar.daemon
+.. automodule:: pulsar.locks
     :members:
     :undoc-members:
     :show-inheritance:
 
-pulsar.locks module
--------------------
+pulsar.main module
+------------------
 
-.. automodule:: pulsar.locks
+.. automodule:: pulsar.main
     :members:
     :undoc-members:
     :show-inheritance:

test/daemon_util_test.py → test/main_util_test.py

-""" Test utilities in pulsar.daemon """
+""" Test utilities in pulsar.main """
 from os.path import join
 from test_utils import temp_directory
-from pulsar import daemon
+from pulsar import main
 
 
 def test_pulsar_config_builder_defaults():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "server.ini"))
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root)
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root)
         assert config.load()["foo"] == "bar1"
 
 
 def test_pulsar_config_builder_defaults_sample():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "server.ini.sample"))
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root)
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root)
         assert config.load()["foo"] == "bar1"
 
 
 def test_pulsar_config_builder_specified_ini():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "moo.ini"))
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root, ini_path="moo.ini")
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root, ini_path="moo.ini")
         assert config.load()["foo"] == "bar1"
 
 
 def test_pulsar_config_builder_specified_ini_args():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "moo.ini"), app="cool1")
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root, args=MockArgs("moo.ini", "cool1"))
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root, args=MockArgs("moo.ini", "cool1"))
         assert config.load()["foo"] == "bar1"
 
 
 def test_pulsar_config_builder_specified_app():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "server.ini"), app="cool1")
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root, app="cool1")
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root, app="cool1")
         assert config.load()["foo"] == "bar1"
 
 
@@ -43,7 +43,7 @@ def test_pulsar_config_builder_app_yaml():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "server.ini"))
         open(join(mock_root, "app.yml"), "w").write("foo: bar2")
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root)
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root)
         assert config.load()["foo"] == "bar2"
 
 
@@ -52,14 +52,14 @@ def test_pulsar_config_builder_override_app_yaml():
         app_yaml_path = join(mock_root, "new_app.yml")
         __write_mock_ini(join(mock_root, "server.ini"), extra="app_config=%s" % app_yaml_path)
         open(app_yaml_path, "w").write("foo: bar2")
-        config = daemon.PulsarConfigBuilder(pulsar_root=mock_root)
+        config = main.PulsarConfigBuilder(pulsar_root=mock_root)
         assert config.load()["foo"] == "bar2"
 
 
 def test_pulsar_manager_config_builder_defaults():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "server.ini"))
-        config = daemon.PulsarManagerConfigBuilder(pulsar_root=mock_root)
+        config = main.PulsarManagerConfigBuilder(pulsar_root=mock_root)
         config.load()["foo"] == "bar1"
         as_dict = config.to_dict()
         assert as_dict["manager"] == "_default_"
@@ -70,7 +70,7 @@ def test_pulsar_manager_config_builder_defaults():
 def test_pulsar_manager_config_builder_overrides():
     with temp_directory() as mock_root:
         __write_mock_ini(join(mock_root, "pulsar5.ini"), app="cool1")
-        config = daemon.PulsarManagerConfigBuilder(pulsar_root=mock_root, app="cool1", ini_path="pulsar5.ini", manager="manager3")
+        config = main.PulsarManagerConfigBuilder(pulsar_root=mock_root, app="cool1", ini_path="pulsar5.ini", manager="manager3")
         config.load()["foo"] == "bar1"
         as_dict = config.to_dict()
         assert as_dict["manager"] == "manager3"