PY-18322 Fixed: PyCharm cannot detect obvious unresolved method

Correctly determine openFunctionType in Python 2. Update read and write types of builtin file in skeletons

python/helpers/python-skeletons/__builtin__.py

@@ -2390,7 +2390,7 @@ class file(object):
     def next(self):
         """Returns the next input line.
 
-        :rtype: bytes | unicode
+        :rtype: bytes
         """
         return ''
 
@@ -2399,7 +2399,7 @@ class file(object):
         before obtaining size bytes).
 
         :type size: numbers.Integral
-        :rtype: bytes | unicode
+        :rtype: bytes
         """
         return ''
 
@@ -2407,7 +2407,7 @@ class file(object):
         """Read one entire line from the file.
 
         :type size: numbers.Integral
-        :rtype: bytes | unicode
+        :rtype: bytes
         """
         return ''
 
@@ -2416,14 +2416,14 @@ class file(object):
         lines thus read.
 
         :type sizehint: numbers.Integral
-        :rtype: list[bytes | unicode]
+        :rtype: list[bytes]
         """
         return []
 
     def xreadlines(self):
         """This method returns the same thing as iter(f).
 
-        :rtype: collections.Iterable[bytes | unicode]
+        :rtype: collections.Iterable[bytes]
         """
         return []
 
@@ -2454,7 +2454,7 @@ class file(object):
     def write(self, str):
         """"Write a string to the file.
 
-        :type str: bytes | unicode
+        :type str: bytes
         :rtype: None
         """
         pass
@@ -2462,7 +2462,7 @@ class file(object):
     def writelines(self, sequence):
         """Write a sequence of strings to the file.
 
-        :type sequence: collections.Iterable[bytes | unicode]
+        :type sequence: collections.Iterable[bytes]
         :rtype: None
         """
         pass

python/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,10 @@ import static com.jetbrains.python.psi.PyUtil.as;
 public class PyStdlibTypeProvider extends PyTypeProviderBase {
   private static final Set<String> OPEN_FUNCTIONS = ImmutableSet.of("__builtin__.open", "io.open", "os.fdopen",
                                                                     "pathlib.Path.open");
-  private static final String BINARY_FILE_TYPE = "io.FileIO[bytes]";
-  private static final String TEXT_FILE_TYPE = "io.TextIOWrapper[unicode]";
+
+  private static final String PY2K_FILE_TYPE = "file";
+  private static final String PY3K_BINARY_FILE_TYPE = "io.FileIO[bytes]";
+  private static final String PY3K_TEXT_FILE_TYPE = "io.TextIOWrapper[unicode]";
 
   @Nullable
   public static PyStdlibTypeProvider getInstance() {
@@ -275,19 +277,16 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
       }
     }
     final LanguageLevel level = LanguageLevel.forElement(anchor);
-    // Binary mode
-    if (mode.contains("b")) {
-      return PyTypeParser.getTypeByName(anchor, BINARY_FILE_TYPE);
-    }
-    // Text mode
-    else {
-      if (level.isPy3K() || "io.open".equals(callQName)) {
-        return PyTypeParser.getTypeByName(anchor, TEXT_FILE_TYPE);
-      }
-      else {
-        return PyTypeParser.getTypeByName(anchor, BINARY_FILE_TYPE);
+
+    if (level.isPy3K() || "io.open".equals(callQName)) {
+      if (mode.contains("b")) {
+        return PyTypeParser.getTypeByName(anchor, PY3K_BINARY_FILE_TYPE);
+      } else {
+        return PyTypeParser.getTypeByName(anchor, PY3K_TEXT_FILE_TYPE);
       }
     }
+
+    return PyTypeParser.getTypeByName(anchor, PY2K_FILE_TYPE);
   }
 
   @Nullable

python/testData/inspections/PyUnresolvedReferencesInspection/fileMethods.py

@@ -0,0 +1,7 @@
+f = open("file.txt")
+f.writelines("a")  # OK
+f.<warning descr="Unresolved attribute reference 'writeliness' for class 'file'">writeliness</warning>("a")
+
+f = open("file.txt", "rb")
+f.writelines("a")  # OK
+f.<warning descr="Unresolved attribute reference 'writeliness' for class 'file'">writeliness</warning>("a")

python/testSrc/com/jetbrains/python/PyTypeTest.java

@@ -694,17 +694,17 @@ public class PyTypeTest extends PyTestCase {
   }
 
   public void testOpenDefault() {
-    doTest("FileIO[str]",
+    doTest("file",
            "expr = open('foo')\n");
   }
 
   public void testOpenText() {
-    doTest("FileIO[str]",
+    doTest("file",
            "expr = open('foo', 'r')\n");
   }
 
   public void testOpenBinary() {
-    doTest("FileIO[str]",
+    doTest("file",
            "expr = open('foo', 'rb')\n");
   }
 

python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java

@@ -348,7 +348,12 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase {
     doMultiFileTest("a.py");
   }
 
-  public void testBytesIORead() {
+  public void testBytesIOMethods() {
+    doTest();
+  }
+
+  // PY-18322
+  public void testFileMethods() {
     doTest();
   }