/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-10-05 20:03:48 UTC
  • mfrom: (877 trunk)
  • mto: This revision was merged to the branch mainline in revision 878.
  • Revision ID: teddy@recompile.se-20161005200348-7vio421w006duism
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
114
114
if sys.version_info.major == 2:
115
115
    str = unicode
116
116
 
117
 
version = "1.7.13"
 
117
version = "1.7.11"
118
118
stored_state_file = "clients.pickle"
119
119
 
120
120
logger = logging.getLogger()
515
515
    _need_version = b"3.3.0"
516
516
 
517
517
    def __init__(self):
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))
 
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))
523
524
 
524
525
    # Unless otherwise indicated, the constants and types below are
525
526
    # all from the gnutls/gnutls.h C header file.
1460
1461
                         exc_info=error)
1461
1462
        return xmlstring
1462
1463
 
1463
 
 
1464
1464
try:
1465
1465
    dbus.OBJECT_MANAGER_IFACE
1466
1466
except AttributeError: