/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/bundle/serializer/__init__.py

  • Committer: Aaron Bentley
  • Date: 2006-09-09 18:52:57 UTC
  • mfrom: (1996 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1997.
  • Revision ID: aaron.bentley@utoronto.ca-20060909185257-ce0ee03ee5125ff1
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/__init__.py
37
37
 
38
38
 
39
39
def _get_filename(f):
40
 
    if hasattr(f, 'name'):
41
 
        return f.name
42
 
    return '<unknown>'
 
40
    return getattr(f, 'name', '<unknown>')
43
41
 
44
42
 
45
43
def read_bundle(f):
69
67
        raise errors.NotABundle('Did not find an opening header')
70
68
 
71
69
    # Now we have a version, to figure out how to read the bundle 
72
 
    if not _serializers.has_key(version):
 
70
    if version not in _serializers:
73
71
        raise errors.BundleNotSupported(version, 
74
72
            'version not listed in known versions')
75
73
 
87
85
    :param version: [optional] target serialization version
88
86
    """
89
87
 
90
 
    if not _serializers.has_key(version):
 
88
    if version not in _serializers:
91
89
        raise errors.BundleNotSupported(version, 'unknown bundle format')
92
90
 
93
91
    serializer = _serializers[version](version)
151
149
    
152
150
    # This has to be formatted for "original" date, so that the
153
151
    # revision XML entry will be reproduced faithfully.
154
 
    if offset == None:
 
152
    if offset is None:
155
153
        offset = 0
156
154
    tt = time.gmtime(t + offset)
157
155
 
262
260
        _serializers[version] = klass
263
261
        return
264
262
 
265
 
    if not _serializers.has_key(version):
 
263
    if version not in _serializers:
266
264
        _serializers[version] = klass
267
265
 
268
266