From 9765cee27caca6d4a84fe30d67806c78bec351fb Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 20 Oct 2023 13:39:43 +0200
Subject: [PATCH] Revert "Python: Model `owslib.etree.etree` directly"

This reverts commit 1213e786519a11142746fd3a725c874181f3a42b.

By fixing a few bugs in the SubclassFinder + manually running Find.ql on the geonode DB from DCA, I found that the installed version of owslib had both: https://github.com/geopython/OWSLib/blob/0.27.2/owslib/etree.py
---
 python/ql/lib/semmle/python/frameworks/Lxml.qll      |  2 --
 .../frameworks/data/internal/auto-owslib.model.yml   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 python/ql/lib/semmle/python/frameworks/data/internal/auto-owslib.model.yml

diff --git a/python/ql/lib/semmle/python/frameworks/Lxml.qll b/python/ql/lib/semmle/python/frameworks/Lxml.qll
index e0fc4715096..fe229d66f3a 100644
--- a/python/ql/lib/semmle/python/frameworks/Lxml.qll
+++ b/python/ql/lib/semmle/python/frameworks/Lxml.qll
@@ -26,8 +26,6 @@ module Lxml {
   API::Node etreeRef() {
     result = API::moduleImport("lxml").getMember("etree")
     or
-    result = API::moduleImport("owslib").getMember("etree").getMember("etree")
-    or
     result = ModelOutput::getATypeNode("lxml.etree~Alias")
   }
 
diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/auto-owslib.model.yml b/python/ql/lib/semmle/python/frameworks/data/internal/auto-owslib.model.yml
new file mode 100644
index 00000000000..95ae927d9d9
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/data/internal/auto-owslib.model.yml
@@ -0,0 +1,12 @@
+# process-mrva-results 0.0.1
+extensions:
+- addsTo:
+    extensible: typeModel
+    pack: codeql/python-all
+  data:
+  - - lxml.etree~Alias
+    - owslib
+    - Member[etree].Member[etree]
+  - - xml.etree.ElementTree~Subclass
+    - owslib
+    - Member[etree].Member[etree]