dependencies: Use DependencyFactory for python3

2 files changed, 18 insertions, 28 deletions

diff --git a/mesonbuild/dependencies/__init__.py b/mesonbuild/dependencies/__init__.py
index 9d8dcf2..6b4250e 100644
--- a/mesonbuild/dependencies/__init__.py
+++ b/mesonbuild/dependencies/__init__.py
@@ -24,7 +24,7 @@ from .dev import ValgrindDependency, gmock_factory, gtest_factory, llvm_factory
 from .coarrays import CoarrayDependency
 from .mpi import MPIDependency
 from .scalapack import ScalapackDependency
-from .misc import (BlocksDependency, CursesDependency, NetCDFDependency, OpenMPDependency, Python3Dependency, ThreadDependency, CupsDependency, LibWmfDependency, LibGCryptDependency, GpgmeDependency, ShadercDependency, pcap_factory)
+from .misc import (BlocksDependency, CursesDependency, NetCDFDependency, OpenMPDependency, ThreadDependency, CupsDependency, LibWmfDependency, LibGCryptDependency, GpgmeDependency, ShadercDependency, pcap_factory, python3_factory)
 from .platform import AppleFrameworks
 from .ui import GLDependency, GnuStepDependency, Qt4Dependency, Qt5Dependency, SDL2Dependency, WxDependency, vulkan_factory
 
@@ -50,7 +50,7 @@ packages.update({
     'curses': CursesDependency,
     'netcdf': NetCDFDependency,
     'openmp': OpenMPDependency,
-    'python3': Python3Dependency,
+    'python3': python3_factory,
     'threads': ThreadDependency,
     'pcap': pcap_factory,
     'cups': CupsDependency,
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index cef726f..f39fb98 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -190,12 +190,14 @@ class BlocksDependency(ExternalDependency):
             self.is_found = True
 
 
-class Python3Dependency(ExternalDependency):
-    def __init__(self, environment, kwargs):
-        super().__init__('python3', environment, kwargs)
+class Python3DependencySystem(ExternalDependency):
+    def __init__(self, name, environment, kwargs):
+        super().__init__(name, environment, kwargs)
 
         if not environment.machines.matches_build_machine(self.for_machine):
             return
+        if not environment.machines[self.for_machine].is_windows():
+            return
 
         self.name = 'python3'
         self.static = kwargs.get('static', False)
@@ -203,29 +205,6 @@ class Python3Dependency(ExternalDependency):
         self.version = '3'
         self._find_libpy3_windows(environment)
 
-    @classmethod
-    def _factory(cls, environment, kwargs):
-        methods = process_method_kw(cls.get_methods(), kwargs)
-        candidates = []
-
-        if DependencyMethods.PKGCONFIG in methods:
-            candidates.append(functools.partial(PkgConfigDependency, 'python3', environment, kwargs))
-
-        if DependencyMethods.SYSCONFIG in methods:
-            candidates.append(functools.partial(Python3Dependency, environment, kwargs))
-
-        if DependencyMethods.EXTRAFRAMEWORK in methods:
-            # In OSX the Python 3 framework does not have a version
-            # number in its name.
-            # There is a python in /System/Library/Frameworks, but that's
-            # python 2, Python 3 will always be in /Library
-            _kargs = kwargs.copy()
-            _kargs[paths] = ['/Library/Frameworks']
-            candidates.append(functools.partial(
-                ExtraFrameworkDependency, 'Python', environment, _kargs))
-
-        return candidates
-
     @staticmethod
     def get_windows_python_arch():
         pyplat = sysconfig.get_platform()
@@ -571,3 +550,14 @@ pcap_factory = DependencyFactory(
     configtool_class=PcapDependencyConfigTool,
     pkgconfig_name='libpcap',
 )
+
+python3_factory = DependencyFactory(
+    'python3',
+    [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM, DependencyMethods.EXTRAFRAMEWORK],
+    system_class=Python3DependencySystem,
+    # There is no version number in the macOS version number
+    framework_name='Python',
+    # There is a python in /System/Library/Frameworks, but thats python 2.x,
+    # Python 3 will always be in /Library
+    extra_kwargs={'paths': ['/Library/Frameworks']},
+)