/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2017-01-25 19:24:00 UTC
  • mfrom: (237.7.439 trunk)
  • Revision ID: teddy@recompile.se-20170125192400-qska3g89wkwg0ccu
MergeĀ fromĀ trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
515
515
    _need_version = b"3.3.0"
516
516
 
517
517
    def __init__(self):
518
 
        # Need to use class name "GnuTLS" here, since this method is
519
 
        # called before the assignment to the "gnutls" global variable
520
 
        # happens.
521
 
        if GnuTLS.check_version(self._need_version) is None:
522
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
523
 
                               .format(self._need_version))
 
518
        # Need to use "self" here, since this method is called before
 
519
        # the assignment to the "gnutls" global variable happens.
 
520
        if self.check_version(self._need_version) is None:
 
521
            raise self.Error("Needs GnuTLS {} or later"
 
522
                             .format(self._need_version))
524
523
 
525
524
    # Unless otherwise indicated, the constants and types below are
526
525
    # all from the gnutls/gnutls.h C header file.
1461
1460
                         exc_info=error)
1462
1461
        return xmlstring
1463
1462
 
 
1463
 
1464
1464
try:
1465
1465
    dbus.OBJECT_MANAGER_IFACE
1466
1466
except AttributeError: