summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--__init__.py5
-rw-r--r--command.py4
-rw-r--r--command_manager.py6
-rw-r--r--commands/ccs2pcs.py4
-rw-r--r--filter.py2
-rw-r--r--filter_manager.py4
-rw-r--r--filters/XML2simpleconfig.py2
-rw-r--r--filters/ccs2ccsflat.py2
-rw-r--r--filters/ccs2coro.py2
-rw-r--r--filters/ccs_obfuscate_credentials.py2
-rw-r--r--filters/ccs_obfuscate_identifiers.py2
-rw-r--r--filters/ccsflat2pcs.py4
-rw-r--r--format.py2
-rw-r--r--format_manager.py4
-rw-r--r--formats/ccs.py4
-rw-r--r--formats/coro.py2
-rw-r--r--formats/pcs.py8
-rw-r--r--formats/simpleconfig.py6
-rw-r--r--main.py7
-rw-r--r--plugin_registry.py2
-rw-r--r--tests/_bootstrap.py4
-rw-r--r--tests/_common.py2
-rw-r--r--tests/ccs2coroxml.py2
-rw-r--r--tests/filter.py2
-rw-r--r--tests/filter_manager.py4
-rw-r--r--tests/format.py2
-rw-r--r--tests/format_manager.py4
-rw-r--r--utils.py4
28 files changed, 58 insertions, 40 deletions
diff --git a/__init__.py b/__init__.py
index 6580369..630f6b0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,8 +1,9 @@
name = __package__
version = '0.1'
copyright = """\
-Copyright 2012 Red Hat, Inc.
+Copyright 2013 Red Hat, Inc.
Licensed under GPLv2
""".rstrip()
+author = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-metadata = (name, version, copyright)
+metadata = (name, version, copyright, author)
diff --git a/command.py b/command.py
index b87dd53..eea7734 100644
--- a/command.py
+++ b/command.py
@@ -1,7 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""Base command stuff (TBD)"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
def as_command(filters):
diff --git a/command_manager.py b/command_manager.py
index f7d3cd4..50f82ca 100644
--- a/command_manager.py
+++ b/command_manager.py
@@ -1,11 +1,13 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""Command manager"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
class CommandManager(object):
- """Class responsible to route commands to filters or other actions"""
+ """Class responsible for commands routing to filters or other actions"""
def __init__(self, filter_manager):
self.filter_manager = filter_manager
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py
index 141449a..09f05eb 100644
--- a/commands/ccs2pcs.py
+++ b/commands/ccs2pcs.py
@@ -1,7 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccs2pcs command"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..command import as_command
diff --git a/filter.py b/filter.py
index 2c000e9..7990466 100644
--- a/filter.py
+++ b/filter.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Base filter stuff (metaclass, decorator, etc.)"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import logging
from os.path import dirname, join
diff --git a/filter_manager.py b/filter_manager.py
index f5a13fe..b59979b 100644
--- a/filter_manager.py
+++ b/filter_manager.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import logging
diff --git a/filters/XML2simpleconfig.py b/filters/XML2simpleconfig.py
index 6799ad1..5f8bc2b 100644
--- a/filters/XML2simpleconfig.py
+++ b/filters/XML2simpleconfig.py
@@ -2,6 +2,8 @@
# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""xml2simpleconfig filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from clufter.filter import XMLFilter
from lxml import etree
diff --git a/filters/ccs2ccsflat.py b/filters/ccs2ccsflat.py
index 889e006..25c85eb 100644
--- a/filters/ccs2ccsflat.py
+++ b/filters/ccs2ccsflat.py
@@ -2,6 +2,8 @@
# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccs2ccsflat filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from os.path import pardir
from subprocess import Popen, PIPE
diff --git a/filters/ccs2coro.py b/filters/ccs2coro.py
index cd541c0..2c90781 100644
--- a/filters/ccs2coro.py
+++ b/filters/ccs2coro.py
@@ -2,6 +2,8 @@
# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccs2coro filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from clufter.filter import XMLFilter
#from lxml import etree
diff --git a/filters/ccs_obfuscate_credentials.py b/filters/ccs_obfuscate_credentials.py
index c046b0f..b1561dd 100644
--- a/filters/ccs_obfuscate_credentials.py
+++ b/filters/ccs_obfuscate_credentials.py
@@ -2,6 +2,8 @@
# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccs_obfuscate_credentials filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from clufter.filter import XMLFilter
#from lxml import etree
diff --git a/filters/ccs_obfuscate_identifiers.py b/filters/ccs_obfuscate_identifiers.py
index b01b0bb..fd727b4 100644
--- a/filters/ccs_obfuscate_identifiers.py
+++ b/filters/ccs_obfuscate_identifiers.py
@@ -2,6 +2,8 @@
# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccs_obfuscate_identifiers filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from clufter.filter import XMLFilter
#from lxml import etree
diff --git a/filters/ccsflat2pcs.py b/filters/ccsflat2pcs.py
index df8f697..5552e22 100644
--- a/filters/ccsflat2pcs.py
+++ b/filters/ccsflat2pcs.py
@@ -1,7 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""ccsflat2pcs filter"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from clufter.filter import Filter
diff --git a/format.py b/format.py
index f135c3b..525ae39 100644
--- a/format.py
+++ b/format.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Base format stuff (metaclass, classes, etc.)"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
# TODO: NamedTuple for tree_stack
diff --git a/format_manager.py b/format_manager.py
index a78ebea..e3e1481 100644
--- a/format_manager.py
+++ b/format_manager.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Format manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from .format import formats
diff --git a/formats/ccs.py b/formats/ccs.py
index dd254b2..c65b662 100644
--- a/formats/ccs.py
+++ b/formats/ccs.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Cluster configuration system (ccs) format"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..format import XML
diff --git a/formats/coro.py b/formats/coro.py
index 8f46b18..55a1766 100644
--- a/formats/coro.py
+++ b/formats/coro.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Corosync executive configuration"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..format import XML
diff --git a/formats/pcs.py b/formats/pcs.py
index 77b92fd..6200c8d 100644
--- a/formats/pcs.py
+++ b/formats/pcs.py
@@ -1,17 +1,17 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Pacemaker configuration system (pcs) format"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..format import XML
class pcs(XML):
- """Cman-based cluster stack configuration (cluster.conf)
+ """Pacemaker-based cluster stack configuration (as XML/CIB)
Also known as Pacemaker Configuration System (pcs).
"""
# XML
- root = 'cluster'
+ root = 'cib'
diff --git a/formats/simpleconfig.py b/formats/simpleconfig.py
index 8de4060..7ec8af6 100644
--- a/formats/simpleconfig.py
+++ b/formats/simpleconfig.py
@@ -1,14 +1,14 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Structured configuration formats such as corosync.conf"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..format import Format, producing
-class simpleconfig(Format):
+class simpleconfig( Format):
""""Structured configuration formats such as corosync.conf"""
# yacc-based parser in fence-virt
native_protocol = 'struct'
diff --git a/main.py b/main.py
index 30e38ac..47df6ef 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Machinery entry point"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import sys
from .format_manager import FormatManager
@@ -21,6 +21,3 @@ def main(argv):
cm = CommandManager(FilterManager(FormatManager()))
ec = cm(argv)
return ec
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv[1:]))
diff --git a/plugin_registry.py b/plugin_registry.py
index 05369a5..7ed36e6 100644
--- a/plugin_registry.py
+++ b/plugin_registry.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Easy (at least for usage) plugin framework"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import imp
import logging
diff --git a/tests/_bootstrap.py b/tests/_bootstrap.py
index 5a4e3b2..8d321c0 100644
--- a/tests/_bootstrap.py
+++ b/tests/_bootstrap.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Bootstrap the environment for testing"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import logging
logging.basicConfig(level=logging.DEBUG)
diff --git a/tests/_common.py b/tests/_common.py
index b866c97..f920c0f 100644
--- a/tests/_common.py
+++ b/tests/_common.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import unittest
diff --git a/tests/ccs2coroxml.py b/tests/ccs2coroxml.py
index a307eeb..edb55bd 100644
--- a/tests/ccs2coroxml.py
+++ b/tests/ccs2coroxml.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from os.path import dirname, join
diff --git a/tests/filter.py b/tests/filter.py
index 31add5b..e7696bb 100644
--- a/tests/filter.py
+++ b/tests/filter.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import unittest
from os.path import dirname, join
diff --git a/tests/filter_manager.py b/tests/filter_manager.py
index 8b070dc..df1231a 100644
--- a/tests/filter_manager.py
+++ b/tests/filter_manager.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import unittest
from os.path import dirname, join
diff --git a/tests/format.py b/tests/format.py
index ea9a75d..a5cb54a 100644
--- a/tests/format.py
+++ b/tests/format.py
@@ -3,7 +3,7 @@
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing filter manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import unittest
from os.path import dirname, join
diff --git a/tests/format_manager.py b/tests/format_manager.py
index 3db5bf6..be010ad 100644
--- a/tests/format_manager.py
+++ b/tests/format_manager.py
@@ -1,9 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Testing format manager"""
-__author__ = "Jan Pokorný <jpokorny at redhat dot com>"
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import unittest
diff --git a/utils.py b/utils.py
index 57f4d89..32d8801 100644
--- a/utils.py
+++ b/utils.py
@@ -1,7 +1,9 @@
# -*- coding: UTF-8 -*-
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""Various helpers"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
import os
generated by cgit (git 2.34.1) at 2024-05-18 02:33:05 +0000