Python: Move urllib and urllib2 to be part of stdlib modeling

python/ql/lib/semmle/python/Frameworks.qll

@@ -47,8 +47,6 @@ private import semmle.python.frameworks.Toml
 private import semmle.python.frameworks.Tornado
 private import semmle.python.frameworks.Twisted
 private import semmle.python.frameworks.Ujson
-private import semmle.python.frameworks.Urllib
-private import semmle.python.frameworks.Urllib2
 private import semmle.python.frameworks.Urllib3
 private import semmle.python.frameworks.Yaml
 private import semmle.python.frameworks.Yarl

python/ql/lib/semmle/python/frameworks/Stdlib.qll

@@ -13,6 +13,9 @@ private import semmle.python.frameworks.PEP249
 private import semmle.python.frameworks.internal.PoorMansFunctionResolution
 private import semmle.python.frameworks.internal.SelfRefMixin
 private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
+// modeling split over multiple files to keep this file from becoming too big
+private import semmle.python.frameworks.Stdlib.Urllib
+private import semmle.python.frameworks.Stdlib.Urllib2
 
 /** Provides models for the Python standard library. */
 module Stdlib {

python/ql/lib/semmle/python/frameworks/Stdlib/Urllib.qll

@@ -1,6 +1,10 @@
 /**
- * Provides classes modeling security-relevant aspects of the `urllib` PyPI package.
- * See https://docs.python.org/3.9/library/urllib.html
+ * Provides classes modeling security-relevant aspects of the `urllib` module, part of
+ * the Python standard library.
+ *
+ * See
+ * - https://docs.python.org/2/library/urllib.html
+ * - https://docs.python.org/3/library/urllib.html
  */
 
 private import python
@@ -8,8 +12,12 @@ private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
 /**
- * Provides models for the `Urllib` PyPI package.
- * see https://docs.python.org/3.9/library/urllib.html
+ * Provides models for the `urllib` module, part of
+ * the Python standard library.
+ *
+ * See
+ * - https://docs.python.org/2/library/urllib.html
+ * - https://docs.python.org/3/library/urllib.html
  */
 private module Urllib {
   /**

python/ql/lib/semmle/python/frameworks/Stdlib/Urllib2.qll

@@ -1,5 +1,7 @@
 /**
- * Provides classes modeling security-relevant aspects of the `urllib2` PyPI package.
+ * Provides classes modeling security-relevant aspects of the `urllib2` module, part of
+ * the Python 2 standard library.
+ *
  * See https://docs.python.org/2/library/urllib2.html
  */
 
@@ -8,8 +10,10 @@ private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
 /**
- * Provides models for the `urllib2` PyPI package.
- * see https://docs.python.org/2/library/urllib2.html
+ * Provides models for the the `urllib2` module, part of
+ * the Python 2 standard library.
+ *
+ * See https://docs.python.org/2/library/urllib2.html
  */
 private module Urllib2 {
   /**

python/ql/test/library-tests/frameworks/urllib/ConceptsTest.ql

@@ -1,2 +0,0 @@
-import python
-import experimental.meta.ConceptsTest

python/ql/test/library-tests/frameworks/urllib2/ConceptsTest.ql

@@ -1,2 +0,0 @@
-import python
-import experimental.meta.ConceptsTest