Merge branch 'refs/heads/pr/4' into update-4.17

# Conflicts:
#	.gitignore
#	Source/PythonConsole/PythonConsole.Build.cs
#	Source/PythonEditor/PythonEditor.Build.cs
#	Source/UnrealEnginePython/Private/UEPyModule.cpp
#	Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
#	Source/UnrealEnginePython/Public/PythonComponent.h
#	Source/UnrealEnginePython/UnrealEnginePython.Build.cs

Author: getnamo

.gitignore

@@ -91,4 +91,7 @@ ENV/
 Binaries/
 
 #don't update this file again
-Content/Scripts/upyconfig.json
+Content/Scripts/upyconfig.json
+python35/
+python27/
+*.un~

CONTRIBUTORS

@@ -1,3 +1,6 @@
+Roberto De Ioris (maintainer and developer, 20Tab)
+Ikrima Elhassan (developer and sponsor, Kite & Lightning)
 Tony Barbieri
 Huey Park
 Eric Feng
+

README.md

@@ -0,0 +1,25 @@
+#include "PythonConsolePrivatePCH.h"
+
+#include "PythonScriptFactory.h"
+#include "PythonScript.h"
+
+UPythonScriptFactory::UPythonScriptFactory(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
+
+	Formats.Add(FString("py;Python Script"));
+
+	bCreateNew = false;
+	bEditAfterNew = true;
+
+	bEditorImport = true;
+
+	SupportedClass = UPythonScript::StaticClass();
+}
+
+UObject* UPythonScriptFactory::FactoryCreateFile(UClass * Class, UObject *InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext *Warn, bool& bOutOperationCanceled) {
+	UPythonScript *NewAsset = NewObject<UPythonScript>(InParent, Class, InName, Flags);
+
+	NewAsset->ScriptPath = Filename;
+
+	bOutOperationCanceled = false;
+	return NewAsset;
+}

Resources/Icon128.png

@@ -0,0 +1,58 @@
+#pragma once
+
+#include "UnrealEd.h"
+#include "PyFactory.generated.h"
+
+UCLASS()
+class UPyFactory : public UFactory
+{
+	GENERATED_BODY()
+
+public:
+
+	virtual UObject* FactoryCreateFile(UClass * Class, UObject *InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext *Warn, bool& bOutOperationCanceled) override {
+		return PyFactoryCreateFile(Class, InParent, InName.ToString(), Filename);
+	}
+
+	virtual UObject* FactoryCreateNew(UClass * Class, UObject *InParent, FName InName, EObjectFlags Flags, UObject *Context, FFeedbackContext *Warn) override {
+		return PyFactoryCreateNew(Class, InParent, InName.ToString());
+	}
+
+	virtual UClass* ResolveSupportedClass() override {
+		if (SupportedClass)
+			return SupportedClass;
+		return PyResolveSupportedClass();
+	}
+
+	virtual FText GetDisplayName() const override {
+		if (!PyDisplayName.IsEmpty()) {
+			return FText::FromString(PyDisplayName);
+		}
+		return FText::FromString(GetClass()->GetName().Replace(UTF8_TO_TCHAR("Factory"), UTF8_TO_TCHAR("")));
+	}
+
+	virtual FText GetToolTip() const override {
+		if (!PyToolTip.IsEmpty()) {
+			return FText::FromString(PyToolTip);
+		}
+		return GetDisplayName();
+	}
+
+	UFUNCTION(BlueprintImplementableEvent)
+	UObject* PyFactoryCreateFile(class UClass * Class, UObject *InParent, const FString & InName, const FString & Filename);
+
+	UFUNCTION(BlueprintImplementableEvent)
+	UObject* PyFactoryCreateNew(class UClass * Class, UObject *InParent, const FString & InName);
+
+	UFUNCTION(BlueprintImplementableEvent)
+	UClass* PyResolveSupportedClass();
+
+	UPROPERTY(BlueprintReadWrite, Category = "PyFactory")
+	FString PyDisplayName;
+
+	UPROPERTY(BlueprintReadWrite, Category = "PyFactory")
+	FString PyToolTip;
+
+};
+
+

Source/PythonConsole/Private/PythonScriptFactory.cpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "UnrealEd.h"
+#include "PythonScriptFactory.generated.h"
+
+UCLASS()
+class UPythonScriptFactory : public UFactory
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual UObject* FactoryCreateFile(UClass * Class, UObject *InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext *Warn, bool& bOutOperationCanceled) override;
+};
+
+

Source/PythonConsole/Public/PyFactory.h

@@ -5,10 +5,12 @@
 
 public class PythonConsole : ModuleRules
 {
-
-
+#if WITH_FORWARDED_MODULE_RULES_CTOR
     public PythonConsole(ReadOnlyTargetRules Target) : base(Target)
-	{
+#else
+    public PythonConsole(TargetInfo Target)
+#endif
+    {
         PrivateIncludePaths.AddRange(
             new string[] {
                 "PythonConsole/Private",
@@ -17,19 +19,19 @@ public PythonConsole(ReadOnlyTargetRules Target) : base(Target)
         );
 
         PrivateDependencyModuleNames.AddRange(
-			new string[] {
-				"Core",
-				"CoreUObject", // @todo Mac: for some reason it's needed to link in debug on Mac
+            new string[] {
+                "Core",
+                "CoreUObject", // @todo Mac: for some reason it's needed to link in debug on Mac
 				"Engine",
                 "InputCore",
-				"UnrealEd",
-				"Slate",
-				"SlateCore",
+                "UnrealEd",
+                "Slate",
+                "SlateCore",
                 "EditorStyle",
                 "TargetPlatform",
                 "UnrealEnginePython"
             }
-		);
+        );
 
     }
 }

Source/PythonConsole/Public/PythonScriptFactory.h

@@ -229,6 +229,9 @@ const TCHAR* BuiltInKeywords[] =
 	TEXT("__le__"),
 	TEXT("__eq__"),
 	TEXT("__call__"),
+	TEXT("with"),
+	TEXT("async"),
+	TEXT("await"),
 };
 
 

Source/PythonConsole/PythonConsole.Build.cs

@@ -6,9 +6,6 @@
 UPythonProject::UPythonProject(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	Path = FPaths::GameContentDir() / TEXT("Scripts");
-	if (!FPaths::DirectoryExists(Path)) {
-		IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
-		PlatformFile.CreateDirectory(*Path);
-	}
+	FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
+	Path = PythonModule.ScriptsPath;
 }