/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/_static_tuple_py.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: v.ladeuil+lp@free.fr-20100120160528-5yo3fbggdp07eovc
Finish the patch based on reviews.

* bzrlib/tests/per_merger.py:
Fix line too long and spurious spaces.

* bzrlib/plugins/news_merge/tests/test_news_merge.py:
(TestFilenameMatchesConfig): Ensure that the params get updated.

* bzrlib/plugins/news_merge/__init__.py:
(filename_matches_config): Save the relevant config variable in
the hook params.
(install_hook): Wrap the hook installation so we can reuse it for
tests.

* bzrlib/plugins/news_merge/README: 
Update the instructions by pointing to the plugin help.

* bzrlib/merge.py:
(MergeHookParams): Delete spurious spaces.

* bzrlib/decorators.py:
(use_pretty_decorators): Mention that we get clearance to copy
launchpad code here (since canonical has copyrights on both code
bases).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_static_tuple_py.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
34
34
 
35
35
    def __init__(self, *args):
36
36
        """Create a new 'StaticTuple'"""
37
 
        num_keys = len(args)
38
 
        if num_keys < 0 or num_keys > 255:
39
 
            raise TypeError('StaticTuple(...) takes from 0 to 255 items')
40
37
        for bit in args:
41
38
            if type(bit) not in (str, StaticTuple, unicode, int, long, float,
42
39
                                 None.__class__, bool):
43
40
                raise TypeError('StaticTuple can only point to'
44
41
                    ' StaticTuple, str, unicode, int, long, float, bool, or'
45
42
                    ' None not %s' % (type(bit),))
 
43
        num_keys = len(args)
 
44
        if num_keys < 0 or num_keys > 255:
 
45
            raise ValueError('must have 1 => 256 key bits')
46
46
        # We don't need to pass args to tuple.__init__, because that was
47
47
        # already handled in __new__.
48
48
        tuple.__init__(self)