From 60edb30580d159270ded4dd9c15b2cdb9f77dc3a Mon Sep 17 00:00:00 2001
From: Semyon Proshev <Semyon.Proshev@jetbrains.com>
Date: Tue, 29 Nov 2016 14:43:41 +0300
Subject: [PATCH] Update skeletons for max function

---
 .../helpers/python-skeletons/__builtin__.py   | 10 ++++++++++
 python/helpers/python-skeletons/builtins.py   | 19 ++++++++++---------
 .../com/jetbrains/python/Py3TypeTest.java     |  5 +++++
 .../com/jetbrains/python/PyTypeTest.java      |  5 +++++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/python/helpers/python-skeletons/__builtin__.py b/python/helpers/python-skeletons/__builtin__.py
index 05ec148bb598..fa7231f78838 100644
--- a/python/helpers/python-skeletons/__builtin__.py
+++ b/python/helpers/python-skeletons/__builtin__.py
@@ -219,6 +219,16 @@ def min(*args, key=None, default=None):
     pass
 
 
+def max(*args, key=None, default=None):
+    """Return the largest item in an iterable or the largest of two or more
+    arguments.
+
+    :type args: T
+    :rtype: T
+    """
+    pass
+
+
 def next(iterator, default=None):
     """Return the next item from the iterator.
 
diff --git a/python/helpers/python-skeletons/builtins.py b/python/helpers/python-skeletons/builtins.py
index 3c927e482c3b..2c772f2308f0 100644
--- a/python/helpers/python-skeletons/builtins.py
+++ b/python/helpers/python-skeletons/builtins.py
@@ -189,15 +189,6 @@ def locals():
     return {}
 
 
-def max(*args, key=None, default=None):
-    """Return the largest item in an iterable or the largest of two or more
-    arguments.
-
-    :rtype: object | unknown
-    """
-    pass
-
-
 class map(object):
     def __init__(self, function, sequence, *sequence_1):
         """Return an iterable of the results of applying the function to the items of
@@ -231,6 +222,16 @@ def min(*args, key=None, default=None):
     pass
 
 
+def max(*args, key=None, default=None):
+    """Return the largest item in an iterable or the largest of two or more
+    arguments.
+
+    :type args: T
+    :rtype: T
+    """
+    pass
+
+
 def next(iterator, default=None):
     """Return the next item from the iterator.
 
diff --git a/python/testSrc/com/jetbrains/python/Py3TypeTest.java b/python/testSrc/com/jetbrains/python/Py3TypeTest.java
index 8d5bb7cb3c3b..66e8bc53eac9 100644
--- a/python/testSrc/com/jetbrains/python/Py3TypeTest.java
+++ b/python/testSrc/com/jetbrains/python/Py3TypeTest.java
@@ -470,6 +470,11 @@ public class Py3TypeTest extends PyTestCase {
            "expr = min(1, 2, 3)");
   }
 
+  public void testMaxResult() {
+    doTest("int",
+           "expr = max(1, 2, 3)");
+  }
+
   private void doTest(final String expectedType, final String text) {
     myFixture.configureByText(PythonFileType.INSTANCE, text);
     final PyExpression expr = myFixture.findElementByText("expr", PyExpression.class);
diff --git a/python/testSrc/com/jetbrains/python/PyTypeTest.java b/python/testSrc/com/jetbrains/python/PyTypeTest.java
index ee44ff76f78f..442d5f7a0ffe 100644
--- a/python/testSrc/com/jetbrains/python/PyTypeTest.java
+++ b/python/testSrc/com/jetbrains/python/PyTypeTest.java
@@ -1519,6 +1519,11 @@ public class PyTypeTest extends PyTestCase {
            "expr = min(1, 2, 3)");
   }
 
+  public void testMaxResult() {
+    doTest("int",
+           "expr = max(1, 2, 3)");
+  }
+
   private static List<TypeEvalContext> getTypeEvalContexts(@NotNull PyExpression element) {
     return ImmutableList.of(TypeEvalContext.codeAnalysis(element.getProject(), element.getContainingFile()).withTracing(),
                             TypeEvalContext.userInitiated(element.getProject(), element.getContainingFile()).withTracing());