diff --git a/direct/src/p3d/AppRunner.py b/direct/src/p3d/AppRunner.py index 74c8f9fc86..38ae45ce3a 100644 --- a/direct/src/p3d/AppRunner.py +++ b/direct/src/p3d/AppRunner.py @@ -584,7 +584,7 @@ class AppRunner(DirectObject): else: # If it's an unknown package, just delete it directly. print "Deleting unknown package %s" % (packageData.pathname) - self.rmtree(packageData.pathname()) + self.rmtree(packageData.pathname) packages = self.deletePackages(packages) if packages: diff --git a/direct/src/p3d/HostInfo.py b/direct/src/p3d/HostInfo.py index 134bcfb35c..ee361913a5 100644 --- a/direct/src/p3d/HostInfo.py +++ b/direct/src/p3d/HostInfo.py @@ -74,7 +74,7 @@ class HostInfo: """ Assigns self.hostUrl, and related values. """ self.hostUrl = hostUrl - if self.hostUrl is None: + if not self.hostUrl: # A special case: the URL will be set later. self.hostUrlPrefix = None self.downloadUrlPrefix = None diff --git a/direct/src/plugin/Sources.pp b/direct/src/plugin/Sources.pp index 6edc489028..11a3facf69 100644 --- a/direct/src/plugin/Sources.pp +++ b/direct/src/plugin/Sources.pp @@ -220,7 +220,7 @@ // to invoke a particular instance of Panda. // - #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]] + #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]] #define USE_PACKAGES tinyxml python openssl cg #define TARGET p3dpython @@ -268,7 +268,7 @@ // the desktop.) // - #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]] + #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]] #define USE_PACKAGES tinyxml python openssl #define TARGET p3dpythonw #define EXTRA_CDEFS NON_CONSOLE @@ -314,7 +314,7 @@ // desparation fallback in case forking fails for some reason. // - #define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]] + #define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]] #define USE_PACKAGES tinyxml python openssl cg #define TARGET libp3dpython #define LIB_PREFIX