Skip to content

Commit

Permalink
Merge redux branch (keystone light)
Browse files Browse the repository at this point in the history
Change-Id: I2cb5b198a06848f42f919ea49e338443131e263e
  • Loading branch information
jeblair committed Feb 14, 2012
2 parents 9452cf0 + 90068b0 commit eef1f0d
Show file tree
Hide file tree
Showing 663 changed files with 11,118 additions and 55,349 deletions.
28 changes: 12 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
*.pyc
.cache/
.project
.project/
.pydevproject
.pydevproject/
.settings/
.keystone-venv/
*.swp
vendor
.ksl-venv
.venv
build/
dist/
doc/source/sourcecode
.tox
keystone.egg-info/
*.db
.*.swp
*.log
*.pid
pidfile
*.komodoproject
run_tests.log
.coverage
covhtml
pep8.txt
nosetests.xml
bla.db
docs/build
.DS_Store
docs/source/modules.rst
docs/source/keystone.*
16 changes: 0 additions & 16 deletions .mailmap

This file was deleted.

50 changes: 0 additions & 50 deletions AUTHORS

This file was deleted.

68 changes: 0 additions & 68 deletions HACKING

This file was deleted.

192 changes: 192 additions & 0 deletions HACKING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
Keystone Style Commandments
===========================

- Step 1: Read http://www.python.org/dev/peps/pep-0008/
- Step 2: Read http://www.python.org/dev/peps/pep-0008/ again
- Step 3: Read on


General
-------
- Put two newlines between top-level code (funcs, classes, etc)
- Put one newline between methods in classes and anywhere else
- Do not write "except:", use "except Exception:" at the very least
- Include your name with TODOs as in "#TODO(termie)"
- Do not name anything the same name as a built-in or reserved word

TODO vs FIXME
-------------

- TODO(name): implies that something should be done (cleanup, refactoring,
etc), but is expected to be functional.
- FIXME(name): implies that the method/function/etc shouldn't be used until
that code is resolved and bug fixed.

Imports
-------
- Do not import objects, only modules
- Do not import more than one module per line
- Do not make relative imports
- Order your imports by the full module path
- Organize your imports according to the following template

Example::

# vim: tabstop=4 shiftwidth=4 softtabstop=4
{{stdlib imports in human alphabetical order}}
\n
{{third-party lib imports in human alphabetical order}}
\n
{{nova imports in human alphabetical order}}
\n
\n
{{begin your code}}


Human Alphabetical Order Examples
---------------------------------
Example::

import httplib
import logging
import random
import StringIO
import time
import unittest

import eventlet
import webob.exc

import nova.api.ec2
from nova.api import openstack
from nova.auth import users
import nova.flags
from nova.endpoint import cloud
from nova import test


Docstrings
----------
Example::

"""A one line docstring looks like this and ends in a period."""


"""A multiline docstring has a one-line summary, less than 80 characters.

Then a new paragraph after a newline that explains in more detail any
general information about the function, class or method. Example usages
are also great to have here if it is a complex class for function.

When writing the docstring for a class, an extra line should be placed
after the closing quotations. For more in-depth explanations for these
decisions see http://www.python.org/dev/peps/pep-0257/

A docstring ends with an empty line before the closing quotations.

Describe parameters and return values, using the Sphinx format; the
appropriate syntax is as follows.

:param foo: the foo parameter
:param bar: the bar parameter
:type bar: parameter type for 'bar'
:returns: return_type -- description of the return value
:returns: description of the return value
:raises: AttributeError, KeyError

"""


Dictionaries/Lists
------------------
If a dictionary (dict) or list object is longer than 80 characters, its items
should be split with newlines. Embedded iterables should have their items
indented. Additionally, the last item in the dictionary should have a trailing
comma. This increases readability and simplifies future diffs.

Example::

my_dictionary = {
"image": {
"name": "Just a Snapshot",
"size": 2749573,
"properties": {
"user_id": 12,
"arch": "x86_64",
},
"things": [
"thing_one",
"thing_two",
],
"status": "ACTIVE",
},
}


Calling Methods
---------------
Calls to methods 80 characters or longer should format each argument with
newlines. This is not a requirement, but a guideline::

unnecessarily_long_function_name('string one',
'string two',
kwarg1=constants.ACTIVE,
kwarg2=['a', 'b', 'c'])


Rather than constructing parameters inline, it is better to break things up::

list_of_strings = [
'what_a_long_string',
'not as long',
]

dict_of_numbers = {
'one': 1,
'two': 2,
'twenty four': 24,
}

object_one.call_a_method('string three',
'string four',
kwarg1=list_of_strings,
kwarg2=dict_of_numbers)


Internationalization (i18n) Strings
-----------------------------------
In order to support multiple languages, we have a mechanism to support
automatic translations of exception and log strings.

Example::

msg = _("An error occurred")
raise HTTPBadRequest(explanation=msg)

If you have a variable to place within the string, first internationalize the
template string then do the replacement.

Example::

msg = _("Missing parameter: %s") % ("flavor",)
LOG.error(msg)

If you have multiple variables to place in the string, use keyword parameters.
This helps our translators reorder parameters when needed.

Example::

msg = _("The server with id %(s_id)s has no key %(m_key)s")
LOG.error(msg % {"s_id": "1234", "m_key": "imageId"})


Creating Unit Tests
-------------------
For every new feature, unit tests should be created that both test and
(implicitly) document the usage of said feature. If submitting a patch for a
bug that had no unit test, a new passing unit test should be added. If a
submitted bug fix does have a unit test, be sure to add a new one that fails
without the patch and passes with the patch.

For more information on creating unit tests and utilizing the testing
infrastructure in OpenStack Nova, please read nova/testing/README.rst.
Loading

0 comments on commit eef1f0d

Please sign in to comment.