This commit is contained in:
brent s. 2020-05-15 01:35:23 -04:00
parent 66561c51d8
commit b00351f762
Signed by: bts
GPG Key ID: 8C004C2F93481F6B

View File

@ -189,11 +189,11 @@ class Config(BaseConfig):




class HEBaseConfig(BaseConfig): class HEBaseConfig(BaseConfig):
default_xsd = '' default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.xsd'
nsmap = {None: '', nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php',
'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')
schema_loc = ' {0}'.format(default_xsd) schema_loc = 'https://tunnelbroker.net/tunnelInfo.php {0}'.format(default_xsd)
url = '' url = ''


def __init__(self, creds, *args, **kwargs): def __init__(self, creds, *args, **kwargs):
@ -228,12 +228,12 @@ class HEBaseConfig(BaseConfig):


# This isn't really used. # This isn't really used.
class HEConfig(HEBaseConfig): class HEConfig(HEBaseConfig):
default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd' default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.xsd'
nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid', nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php',
'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')
schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd) schema_loc = 'https://tunnelbroker.net/tunnelInfo.php {0}'.format(default_xsd)
url = 'https://tunnelbroker.net/tunnelInfo.php?tid={0}' url = 'https://tunnelbroker.net/tunnelInfo.php'


def __init__(self, creds, *args, **kwargs): def __init__(self, creds, *args, **kwargs):
super().__init__(creds, *args, **kwargs) super().__init__(creds, *args, **kwargs)
@ -245,11 +245,11 @@ class HEConfig(HEBaseConfig):




class HETunnelConfig(HEBaseConfig): class HETunnelConfig(HEBaseConfig):
default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd' # default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd'
nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid', # nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid',
'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} # 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') # attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')
schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd) # schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd)
url = 'https://tunnelbroker.net/tunnelInfo.php?tid={0}' url = 'https://tunnelbroker.net/tunnelInfo.php?tid={0}'


def __init__(self, tun_id, creds, update_key, *args, **kwargs): def __init__(self, tun_id, creds, update_key, *args, **kwargs):