From 730fb46124f02e28e8d2fa95b43e7f260c717c96 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 7 Mar 2015 22:06:18 -0500
Subject: [PATCH] Rename module to so module and method don't conflict in
autodoc.
---
docs/pulsar.managers.staging.rst | 12 ++++++------
pulsar/managers/staging/__init__.py | 4 ++--
pulsar/managers/staging/{postprocess.py => post.py} | 0
pulsar/managers/staging/{preprocess.py => pre.py} | 0
4 files changed, 8 insertions(+), 8 deletions(-)
rename pulsar/managers/staging/{postprocess.py => post.py} (100%)
rename pulsar/managers/staging/{preprocess.py => pre.py} (100%)
diff --git a/docs/pulsar.managers.staging.rst b/docs/pulsar.managers.staging.rst
index 56ac7852..0f14f5af 100644
--- a/docs/pulsar.managers.staging.rst
+++ b/docs/pulsar.managers.staging.rst
@@ -4,18 +4,18 @@ pulsar.managers.staging package
Submodules
----------
-pulsar.managers.staging.postprocess module
-------------------------------------------
+pulsar.managers.staging.post module
+-----------------------------------
-.. automodule:: pulsar.managers.staging.postprocess
+.. automodule:: pulsar.managers.staging.post
:members:
:undoc-members:
:show-inheritance:
-pulsar.managers.staging.preprocess module
------------------------------------------
+pulsar.managers.staging.pre module
+----------------------------------
-.. automodule:: pulsar.managers.staging.preprocess
+.. automodule:: pulsar.managers.staging.pre
:members:
:undoc-members:
:show-inheritance:
diff --git a/pulsar/managers/staging/__init__.py b/pulsar/managers/staging/__init__.py
index 366cb343..829abd0c 100644
--- a/pulsar/managers/staging/__init__.py
+++ b/pulsar/managers/staging/__init__.py
@@ -3,7 +3,7 @@ preprocessing (currently this means downloading or copying files) and then unsta
or send results back to client during postprocessing.
"""
-from .postprocess import postprocess
-from .preprocess import preprocess
+from .post import postprocess
+from .pre import preprocess
__all__ = ['preprocess', 'postprocess']
diff --git a/pulsar/managers/staging/postprocess.py b/pulsar/managers/staging/post.py
similarity index 100%
rename from pulsar/managers/staging/postprocess.py
rename to pulsar/managers/staging/post.py
diff --git a/pulsar/managers/staging/preprocess.py b/pulsar/managers/staging/pre.py
similarity index 100%
rename from pulsar/managers/staging/preprocess.py
rename to pulsar/managers/staging/pre.py
--
GitLab