From b00351f7629e6ae8c688970fe0e6903e0bb32f4d Mon Sep 17 00:00:00 2001 From: brent s Date: Fri, 15 May 2020 01:35:23 -0400 Subject: [PATCH] oops --- utils/he_ipv6/config.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/utils/he_ipv6/config.py b/utils/he_ipv6/config.py index 342d38c..a306f8b 100644 --- a/utils/he_ipv6/config.py +++ b/utils/he_ipv6/config.py @@ -189,11 +189,11 @@ class Config(BaseConfig): class HEBaseConfig(BaseConfig): - default_xsd = '' - nsmap = {None: '', + default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.xsd' + nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php', 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} 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 = '' def __init__(self, creds, *args, **kwargs): @@ -228,12 +228,12 @@ class HEBaseConfig(BaseConfig): # This isn't really used. class HEConfig(HEBaseConfig): - default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd' - nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid', + default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.xsd' + nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php', 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') - schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd) - url = 'https://tunnelbroker.net/tunnelInfo.php?tid={0}' + schema_loc = 'https://tunnelbroker.net/tunnelInfo.php {0}'.format(default_xsd) + url = 'https://tunnelbroker.net/tunnelInfo.php' def __init__(self, creds, *args, **kwargs): super().__init__(creds, *args, **kwargs) @@ -245,11 +245,11 @@ class HEConfig(HEBaseConfig): class HETunnelConfig(HEBaseConfig): - default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd' - nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid', - 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} - attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') - schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd) + # default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd' + # nsmap = {None: 'https://tunnelbroker.net/tunnelInfo.php?tid', + # 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'} + # attr_qname = etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation') + # schema_loc = 'https://tunnelbroker.net/tunnelInfo.php?tid {0}'.format(default_xsd) url = 'https://tunnelbroker.net/tunnelInfo.php?tid={0}' def __init__(self, tun_id, creds, update_key, *args, **kwargs):