diff --git a/docs/conf.py b/docs/conf.py index edcb71fee4cf505ad221a21e22ffaf0176d7b4e0..a23c197204e43f7471c44c0a8a6c04b0df15dbcf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -81,7 +81,6 @@ pygments_style = 'sphinx' # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False - # -- Options for HTML output ---------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for @@ -100,13 +99,11 @@ html_theme = 'alabaster' # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] - # -- Options for HTMLHelp output ------------------------------------------ # Output file base name for HTML help builder. htmlhelp_basename = 'satelladoc' - # -- Options for LaTeX output --------------------------------------------- latex_elements = { @@ -135,7 +132,6 @@ latex_documents = [ u'Piotr Maslanka', 'manual'), ] - # -- Options for manual page output --------------------------------------- # One entry per manual page. List of tuples @@ -145,7 +141,6 @@ man_pages = [ [author], 1) ] - # -- Options for Texinfo output ------------------------------------------- # Grouping the document tree into Texinfo files. List of tuples @@ -156,6 +151,3 @@ texinfo_documents = [ author, 'satella', 'One line description of project.', 'Miscellaneous'), ] - - - diff --git a/docs/index.rst b/docs/index.rst index 91f0da56059b111378c49912d889c7bb21d14ffc..596fb06c199af1dc20dcb758de904c3327922f55 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,17 +2,17 @@ Welcome to satella's documentation! =================================== .. toctree:: - :maxdepth: 2 - :caption: Contents: +:maxdepth: 2 + :caption: Contents: - coding/monitor - coding/debug - coding/typechecking - coding/structures - instrumentation/traceback - instrumentation/metrics - source/modules - examples/echoist + coding/monitor + coding/debug + coding/typechecking + coding/structures + instrumentation/traceback + instrumentation/metrics + source/modules + examples/echoist Indices and tables diff --git a/satella/instrumentation/trace_back.py b/satella/instrumentation/trace_back.py index 0112cc62c034ffc5453eb41acba4e52a2509d0d7..71667185949308cf08b63c1558ec7b9c43da7c64 100644 --- a/satella/instrumentation/trace_back.py +++ b/satella/instrumentation/trace_back.py @@ -144,7 +144,7 @@ class StoredVariable(object): self.pickle = zlib.compress( self.pickle, policy.get_compression_level( - self.pickle)) + self.pickle)) self.pickle_type = "pickle/gzip" except zlib.error: pass # ok, keep normal @@ -255,7 +255,7 @@ class Traceback(object): output.write(u'\n* Stack trace, innermost first\n') for frame in self.frames: output.write(u'** %s at %s:%s\n' % ( - frame.name, frame.filename, frame.lineno)) + frame.name, frame.filename, frame.lineno)) for name, value in six.iteritems(frame.locals): try: output.write(u'*** %s: %s\n' % (name, value.repr)) diff --git a/setup.py b/setup.py index 70ee38300428db67d64a15d68a530ae90851add7..bc3db6faf06e6a39aba5964eb0d76c73f7e5e11e 100644 --- a/setup.py +++ b/setup.py @@ -4,12 +4,12 @@ from setuptools import setup, find_packages setup(keywords=['ha', 'high availability', 'scalable', 'scalability', 'server'], packages=find_packages(include=['satella', 'satella.*']), install_requires=[ - "six", - "monotonic", - "backports.typing" + "six", + "monotonic", + "backports.typing" ], tests_require=[ "nose", "mock", "coverage" ], test_suite='nose.collector' - ) + )