Remove __self variable

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-09-21 20:25:37 +02:00
parent 3f9213be7e
commit 57ed946414
7 changed files with 1 additions and 9 deletions

View file

@ -5,6 +5,7 @@ Changelog (v2.1 specific)
* Exception: No braces means author == Nico Schottelius * Exception: No braces means author == Nico Schottelius
2.1.0: 2.1.0:
* Core: Removed obsolete variable __self
* Removed type __addifnosuchline (replaced by __line) * Removed type __addifnosuchline (replaced by __line)
* Removed type __removeline (replaced by __line) * Removed type __removeline (replaced by __line)
* Type __directory: Parameter --parents and --recursive are now boolean * Type __directory: Parameter --parents and --recursive are now boolean

View file

@ -184,9 +184,6 @@ __object_id::
the filesystem database and ensured by the core). the filesystem database and ensured by the core).
Note: Double slashes ("//") will not be fixed and result in an error. Note: Double slashes ("//") will not be fixed and result in an error.
__self::
DEPRECATED: Same as __object_name, do not use anymore, use __object_name instead.
Will be removed in cdist 2.1.
__object_name:: __object_name::
The full qualified name of the current object. The full qualified name of the current object.
Available for: type manifest, type explorer, type gencode Available for: type manifest, type explorer, type gencode

View file

@ -103,7 +103,6 @@ class Code(object):
'__object': cdist_object.absolute_path, '__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id, '__object_id': cdist_object.object_id,
'__object_name': cdist_object.name, '__object_name': cdist_object.name,
'__self': cdist_object.name,
}) })
return self.local.run_script(script, env=env, return_output=True) return self.local.run_script(script, env=env, return_output=True)

View file

@ -96,7 +96,6 @@ class Manifest(object):
'__object': cdist_object.absolute_path, '__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id, '__object_id': cdist_object.object_id,
'__object_name': cdist_object.name, '__object_name': cdist_object.name,
'__self': cdist_object.name,
'__type': cdist_object.cdist_type.absolute_path, '__type': cdist_object.cdist_type.absolute_path,
'__cdist_manifest': script, '__cdist_manifest': script,
}) })

View file

@ -78,7 +78,6 @@ class CodeTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path) self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id) self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], self.cdist_object.name) self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
self.assertEqual(output_dict['__self'], self.cdist_object.name)
def test_run_gencode_remote_environment(self): def test_run_gencode_remote_environment(self):
output_string = self.code.run_gencode_remote(self.cdist_object) output_string = self.code.run_gencode_remote(self.cdist_object)
@ -94,7 +93,6 @@ class CodeTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path) self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id) self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], self.cdist_object.name) self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
self.assertEqual(output_dict['__self'], self.cdist_object.name)
def test_transfer_code_remote(self): def test_transfer_code_remote(self):
self.cdist_object.code_remote = self.code.run_gencode_remote(self.cdist_object) self.cdist_object.code_remote = self.code.run_gencode_remote(self.cdist_object)

View file

@ -6,4 +6,3 @@ echo "echo __type: $__type"
echo "echo __object: $__object" echo "echo __object: $__object"
echo "echo __object_id: $__object_id" echo "echo __object_id: $__object_id"
echo "echo __object_name: $__object_name" echo "echo __object_name: $__object_name"
echo "echo __self: $__self"

View file

@ -101,7 +101,6 @@ class ManifestTestCase(test.CdistTestCase):
self.assertEqual(output_dict['__object'], cdist_object.absolute_path) self.assertEqual(output_dict['__object'], cdist_object.absolute_path)
self.assertEqual(output_dict['__object_id'], cdist_object.object_id) self.assertEqual(output_dict['__object_id'], cdist_object.object_id)
self.assertEqual(output_dict['__object_name'], cdist_object.name) self.assertEqual(output_dict['__object_name'], cdist_object.name)
self.assertEqual(output_dict['__self'], cdist_object.name)
def test_debug_env_setup(self): def test_debug_env_setup(self):
self.log.setLevel(logging.DEBUG) self.log.setLevel(logging.DEBUG)