move TYPE_PREFIX back into main, as it's only needed there and should work without module

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
remotes/origin/2.0
Nico Schottelius 13 years ago
parent 16d58dcac7
commit 3f6c479d72
  1. 4
      bin/cdist
  2. 1
      lib/cdist/__init__.py

@ -34,6 +34,8 @@ import tempfile
log = logging.getLogger(__name__)
TYPE_PREFIX = "__"
class Cdist:
"""Cdist main class to hold arbitrary data"""
@ -482,7 +484,7 @@ if __name__ == "__main__":
'../lib')))
import cdist
if re.match(cdist.TYPE_PREFIX, os.path.basename(sys.argv[0])):
if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
emulator()
else:
import cdist.banner

@ -19,7 +19,6 @@
#
#
TYPE_PREFIX = "__"
VERSION = "2.0.2"
class Error(Exception):

Loading…
Cancel
Save