don't use acronym, keep flake8 happy

Author: furlongm

errata/sources/distros/centos.py

@@ -15,7 +15,7 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 import re
-from defusedxml import ElementTree as ET
+from defusedxml import ElementTree
 
 from operatingsystems.utils import get_or_create_osrelease
 from packages.models import Package
@@ -65,7 +65,7 @@ def parse_centos_errata_checksum(data):
 def parse_centos_errata(data):
     """ Parse CentOS errata from https://cefs.steve-meier.de/
     """
-    result = ET.XML(data)
+    result = ElementTree.XML(data)
     errata_xml = result.findall('*')
     elen = len(errata_xml)
     pbar_start.send(sender=None, ptext=f'Processing {elen} CentOS Errata', plen=elen)

errata/sources/repos/yum.py

@@ -16,7 +16,7 @@
 
 import concurrent.futures
 from io import BytesIO
-import defusedxml.ElementTree as ET
+from defusedxml import ElementTree
 
 from operatingsystems.utils import get_or_create_osrelease
 from packages.models import Package
@@ -30,11 +30,11 @@ def extract_updateinfo(data, url, concurrent_processing=True):
     """
     extracted = extract(data, url)
     try:
-        tree = ET.parse(BytesIO(extracted))
+        tree = ElementTree.parse(BytesIO(extracted))
         root = tree.getroot()
         elen = root.__len__()
         updates = root.findall('update')
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=f'Error parsing updateinfo file from {url} : {e}')
     if concurrent_processing:
         extract_updateinfo_concurrently(updates, elen)

repos/repo_types/gentoo.py

@@ -20,7 +20,7 @@
 import shutil
 import tarfile
 import tempfile
-from defusedxml import ElementTree as ET
+from defusedxml import ElementTree
 from fnmatch import fnmatch
 from io import BytesIO
 
@@ -94,7 +94,7 @@ def get_gentoo_overlay_mirrors(repo_name):
         return
     mirrors = []
     try:
-        tree = ET.parse(BytesIO(res.content))
+        tree = ElementTree.parse(BytesIO(res.content))
         root = tree.getroot()
         for child in root:
             if child.tag == 'repo':
@@ -105,7 +105,7 @@ def get_gentoo_overlay_mirrors(repo_name):
                     if found and element.tag == 'source':
                         if element.text.startswith('http'):
                             mirrors.append(element.text)
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=f'Error parsing {gentoo_overlays_url}: {e}')
     return mirrors
 
@@ -119,7 +119,7 @@ def get_gentoo_mirror_urls():
         return
     mirrors = {}
     try:
-        tree = ET.parse(BytesIO(res.content))
+        tree = ElementTree.parse(BytesIO(res.content))
         root = tree.getroot()
         for child in root:
             if child.tag == 'mirrorgroup':
@@ -139,7 +139,7 @@ def get_gentoo_mirror_urls():
                         elif element.tag == 'uri':
                             if element.get('protocol') == 'http':
                                 mirrors[name]['urls'].append(element.text)
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=f'Error parsing {gentoo_distfiles_url}: {e}')
     mirror_urls = []
     # for now, ignore region data and choose MAX_MIRRORS mirrors at random

repos/repo_types/yum.py

@@ -16,7 +16,7 @@
 
 import re
 import yaml
-from defusedxml import ElementTree as ET
+from defusedxml import ElementTree
 from io import BytesIO
 
 from errata.sources.repos.yum import extract_updateinfo
@@ -39,7 +39,7 @@ def get_repomd_url(mirror_url, data, url_type='primary'):
     extracted = extract(data, mirror_url)
     location = None
     try:
-        tree = ET.parse(BytesIO(extracted))
+        tree = ElementTree.parse(BytesIO(extracted))
         root = tree.getroot()
         for child in root:
             if child.attrib.get('type') == url_type:
@@ -49,7 +49,7 @@ def get_repomd_url(mirror_url, data, url_type='primary'):
                     if grandchild.tag == f'{{{ns}}}checksum':
                         checksum = grandchild.text
                         checksum_type = grandchild.attrib.get('type')
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=(f'Error parsing repomd from {mirror_url}: {e}'))
     if not location:
         return None, None, None
@@ -110,7 +110,7 @@ def extract_yum_packages(data, url):
     ns = 'http://linux.duke.edu/metadata/common'
     packages = set()
     try:
-        context = ET.iterparse(BytesIO(extracted), events=('start', 'end'))
+        context = ElementTree.iterparse(BytesIO(extracted), events=('start', 'end'))
         for event, elem in context:
             if event == 'start':
                 if elem.tag == f'{{{ns}}}metadata':
@@ -152,7 +152,7 @@ def extract_yum_packages(data, url):
                         text = f'Error parsing Package: {name} {epoch} {version} {release} {arch}'
                         error_message.send(sender=None, text=text)
                 elem.clear()
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=f'Error parsing yum primary.xml from {url}: {e}')
     return packages
 

repos/utils.py

@@ -17,8 +17,7 @@
 
 import re
 from io import BytesIO
-
-from defusedxml import ElementTree as ET
+from defusedxml import ElementTree
 from tenacity import RetryError
 
 from django.db import IntegrityError
@@ -121,7 +120,7 @@ def get_metalink_urls(url):
     extracted = extract(data, url)
     ns = 'http://www.metalinker.org/'
     try:
-        tree = ET.parse(BytesIO(extracted))
+        tree = ElementTree.parse(BytesIO(extracted))
         root = tree.getroot()
         for child in root:
             if child.tag == f'{{{ns}}}files':
@@ -133,7 +132,7 @@ def get_metalink_urls(url):
                                     if greatgreatgrandchild.tag == f'{{{ns}}}url':
                                         if greatgreatgrandchild.attrib.get('protocol') in ['https', 'http']:
                                             metalink_urls.append(greatgreatgrandchild.text)
-    except ET.ParseError as e:
+    except ElementTree.ParseError as e:
         error_message.send(sender=None, text=f'Error parsing metalink {url}: {e}')
     return metalink_urls