aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2010-06-22 12:11:36 -0400
committerChris Ball <cjb@laptop.org>2010-06-22 12:11:36 -0400
commitc91e05c4211ea94d513b2024719c6ee27b5d6dab (patch)
treebed6478da41f6160c212a728e805fe4108a9c1a0
parent0df4bd7ae194bb07f36a2a69a0549037de01cb52 (diff)
parent401152d6eec5167043dedde60c0a64d0affbd120 (diff)
downloadbugseverywhere-c91e05c4211ea94d513b2024719c6ee27b5d6dab.tar.gz
Merge with Trevor
-rw-r--r--doc/conf.py9
-rw-r--r--libbe/command/new.py9
-rw-r--r--libbe/storage/util/config.py4
-rw-r--r--libbe/ui/util/user.py4
4 files changed, 22 insertions, 4 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 1090a28..371480e 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -25,7 +25,8 @@ import libbe.version
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage',
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.autosummary',
+ 'sphinx.ext.doctest', 'sphinx.ext.coverage',
'numpydoc']
# Add any paths that contain templates here, relative to this directory.
@@ -196,3 +197,9 @@ latex_documents = [
# If false, no module index is generated.
#latex_use_modindex = True
+
+# -- Options for Intersphinx ---------------------------------------------------
+
+intersphinx_mapping = {
+ 'http://docs.python.org/dev': None,
+ }
diff --git a/libbe/command/new.py b/libbe/command/new.py
index be18306..a2982a8 100644
--- a/libbe/command/new.py
+++ b/libbe/command/new.py
@@ -68,6 +68,10 @@ class New (libbe.command.Command):
help='The user who reported the bug',
arg=libbe.command.Argument(
name='reporter', metavar='NAME')),
+ libbe.command.Option(name='creator', short_name='c',
+ help='The user who created the bug',
+ arg=libbe.command.Argument(
+ name='creator', metavar='NAME')),
libbe.command.Option(name='assigned', short_name='a',
help='The developer in charge of the bug',
arg=libbe.command.Argument(
@@ -85,7 +89,10 @@ class New (libbe.command.Command):
summary = params['summary']
bugdir = self._get_bugdir()
bug = bugdir.new_bug(summary=summary.strip())
- bug.creator = self._get_user_id()
+ if params['creator'] != None:
+ bug.creator = params['creator']
+ else:
+ bug.creator = self._get_user_id()
if params['reporter'] != None:
bug.reporter = params['reporter']
else:
diff --git a/libbe/storage/util/config.py b/libbe/storage/util/config.py
index 724d2d3..7d59712 100644
--- a/libbe/storage/util/config.py
+++ b/libbe/storage/util/config.py
@@ -37,8 +37,10 @@ Initialized with :func:`libbe.util.encoding.get_filesystem_encoding`.
def path():
"""Return the path to the per-user config file.
+
+ Defaults to :file:`~/.bugs_everywhere`.
"""
- return os.path.expanduser("~/.bugs_everywhere")
+ return os.path.expanduser(os.path.join('~','.bugs_everywhere'))
def set_val(name, value, section="DEFAULT", encoding=None):
"""Set a value in the per-user config file.
diff --git a/libbe/ui/util/user.py b/libbe/ui/util/user.py
index 460a1dd..412575f 100644
--- a/libbe/ui/util/user.py
+++ b/libbe/ui/util/user.py
@@ -101,10 +101,12 @@ def get_user_id(storage=None):
The source order is:
- 1. Global BE configuration.
+ 1. Global BE configuration [#]_ (default section, setting 'user').
2. `storage.get_user_id`, if that function is defined.
3. :func:`get_fallback_username` and :func:`get_fallback_email`.
+ .. [#] See :mod:`libbe.storage.util.config`.
+
Notes
-----
Sometimes the storage will keep track of the user ID (e.g. most