openstack/zaqar
Code Issues Proposed changes

Remove the __MARCONI_SETUP_ global from init

Browse Source 
This was used to know when Marconi was being loaded and avoid
registering configuration options and doing other things. This is not
necessary anymore.

Change-Id: Icf43302581eefb563b10ddec5831eeec0d068872
Partially-Implements: py3k-support
This commit is contained in:
Flavio Percoco 2013-12-05 02:06:43 +01:00
parent 666693ff29
commit 3d3d6ef839
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
marconi/__init__.py
View File

@ -13,16 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Import guard. No module level import during the setup procedure. import marconi.queues.bootstrap
try:
if __MARCONI_SETUP__: # NOQA
import sys as _sys
_sys.stderr.write('Running from marconi source directory.\n')
del _sys
except NameError:
import marconi.queues.bootstrap
Bootstrap = marconi.queues.bootstrap.Bootstrap
import marconi.version import marconi.version
Bootstrap = marconi.queues.bootstrap.Bootstrap
__version__ = marconi.version.version_info.cached_version_string() __version__ = marconi.version.version_info.cached_version_string()