Merge branch 'python-fixes'

python/helpers/pycharm_generator_utils/constants.py

@@ -224,10 +224,10 @@ SIMPLE_VALUE_RE = re.compile(
 
 ###########################   parsing   ###########################################################
 if version[0] < 3:
-    from pyparsing import *
+    from pycharm_generator_utils.pyparsing import *
 else:
     #noinspection PyUnresolvedReferences
-    from pyparsing_py3 import *
+    from pycharm_generator_utils.pyparsing_py3 import *
 
 # grammar to parse parameter lists
 

python/testData/inspections/PyArgumentListInspection/dictFromKeys.py

@@ -0,0 +1,2 @@
+print(dict.fromkeys(<warning descr="Parameter 'seq' unfilled">)</warning>)
+print(dict.fromkeys(['foo', 'bar']))

python/testData/inspections/PyArgumentListInspection/unicodeConstructor.py

@@ -0,0 +1,5 @@
+print(unicode())
+print(unicode(''))
+print(unicode('', 'utf-8'))
+print(unicode('', 'utf-8', 'ignore'))
+print(unicode('', 'utf-8', 'ignore', <warning descr="Unexpected argument">foo</warning>))

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

@@ -158,4 +158,14 @@ public class PyArgumentListInspectionTest extends PyTestCase {
   public void testPropertyReturnsCallable() {
     doTest();
   }
+
+  // PY-11162
+  public void testUnicodeConstructor() {
+    doTest();
+  }
+
+  // PY-11169
+  public void testDictFromKeys() {
+    doTest();
+  }
 }