/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 breezy/revision.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/revision.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
# TODO: Some kind of command-line display of revision properties:
20
18
# perhaps show them in log -v and allow them as options to the commit command.
21
19
 
28
26
    errors,
29
27
    osutils,
30
28
    )
31
 
from .sixish import (
32
 
    text_type,
33
 
    )
34
29
 
35
30
NULL_REVISION = b"null:"
36
31
CURRENT_REVISION = b"current:"
90
85
        """Verify that all revision properties are OK."""
91
86
        for name, value in self.properties.items():
92
87
            # GZ 2017-06-10: What sort of string are properties exactly?
93
 
            not_text = not isinstance(name, (text_type, str))
 
88
            not_text = not isinstance(name, str)
94
89
            if not_text or osutils.contains_whitespace(name):
95
90
                raise ValueError("invalid property name %r" % name)
96
 
            if not isinstance(value, (text_type, bytes)):
 
91
            if not isinstance(value, (str, bytes)):
97
92
                raise ValueError("invalid property value %r for %r" %
98
93
                                 (value, name))
99
94