From 4b72a6ab91ae39980fd3ddb7ba698488e7946ab0 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Wed, 25 Mar 2015 21:16:40 +0300
Subject: [PATCH] fixed test data according new Python language level (3.5)

---
 .../PyCompatibilityInspection/binaryExpression.py    |  4 ++--
 .../PyCompatibilityInspection/callExpression.py      |  4 ++--
 .../PyCompatibilityInspection/exceptBlock.py         |  2 +-
 .../PyCompatibilityInspection/fromImportStatement.py | 12 +++++++-----
 .../PyCompatibilityInspection/importElement.py       |  2 +-
 .../PyCompatibilityInspection/importStatement.py     |  6 ++++--
 .../PyCompatibilityInspection/listCompExpression.py  |  2 +-
 .../numericLiteralExpression.py                      |  4 ++--
 .../PyCompatibilityInspection/raiseStatement.py      |  4 ++--
 .../PyCompatibilityInspection/reprExpression.py      |  2 +-
 .../stringLiteralExpression.py                       | 10 +++++-----
 python/testData/inspections/ReplaceNotEqOperator.py  |  2 +-
 12 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/python/testData/inspections/PyCompatibilityInspection/binaryExpression.py b/python/testData/inspections/PyCompatibilityInspection/binaryExpression.py
index d9c7e856eb88..8f4225625b7a 100644
--- a/python/testData/inspections/PyCompatibilityInspection/binaryExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/binaryExpression.py
@@ -1,4 +1,4 @@
-print(<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support <>, use != instead.">a <> b</warning>)
+print(<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support <>, use != instead.">a <> b</warning>)
 
-if <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support <>, use != instead.">a <> 2</warning>:
+if <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support <>, use != instead.">a <> 2</warning>:
     var = a
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/callExpression.py b/python/testData/inspections/PyCompatibilityInspection/callExpression.py
index 68afd5aa009c..b02445efb9b3 100644
--- a/python/testData/inspections/PyCompatibilityInspection/callExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/callExpression.py
@@ -3,10 +3,10 @@ class A(B):
         <warning descr="Python version 2.4, 2.5, 2.6, 2.7 do not support this syntax. super() should have arguments in Python 2">super()</warning>
 
 <warning descr="Python version 3.1, 3.2, 3.3, 3.4 do not have method cmp">cmp()</warning>
-<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not have method reduce">reduce()</warning>
+<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not have method reduce">reduce()</warning>
 <warning descr="Python version 2.4 does not have method all">all()</warning>
 
-<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not have method buffer">buffer()</warning>
+<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not have method buffer">buffer()</warning>
 
 def foo(a,b,c):
     print (a,b,c)
diff --git a/python/testData/inspections/PyCompatibilityInspection/exceptBlock.py b/python/testData/inspections/PyCompatibilityInspection/exceptBlock.py
index 8f113c72d618..8f19453968c2 100644
--- a/python/testData/inspections/PyCompatibilityInspection/exceptBlock.py
+++ b/python/testData/inspections/PyCompatibilityInspection/exceptBlock.py
@@ -5,5 +5,5 @@ try:
 
 try:
     do_smth()
-<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support this syntax.">except ImportError, ImportWarning:
+<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support this syntax.">except ImportError, ImportWarning:
     do()</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/fromImportStatement.py b/python/testData/inspections/PyCompatibilityInspection/fromImportStatement.py
index 15a869f2608b..6dcbcf4ab8ba 100644
--- a/python/testData/inspections/PyCompatibilityInspection/fromImportStatement.py
+++ b/python/testData/inspections/PyCompatibilityInspection/fromImportStatement.py
@@ -1,8 +1,10 @@
-<warning descr="Python version 2.4 doesn't support this syntax.">from . import smth</warning>
-<warning descr="Python version 2.4 doesn't support this syntax.">from .module import name1, name2</warning>
+<warning descr="Python version 2.4 doesn't support this syntax.">
+</warning>
+<warning descr="Python version 2.4 doesn't support this syntax.">
+</warning>
 
-from <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not have module Bastion">Bastion</warning> import BastionClass
+from <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not have module Bastion">Bastion</warning>
 
-<warning descr="Python version 2.4 doesn't support this syntax.">from . import exceptions</warning>
+<warning descr="Python version 2.4 doesn't support this syntax.">
+</warning>
 
-from email.Utils import formatdate
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/importElement.py b/python/testData/inspections/PyCompatibilityInspection/importElement.py
index 5927f387bf90..361471fb8b95 100644
--- a/python/testData/inspections/PyCompatibilityInspection/importElement.py
+++ b/python/testData/inspections/PyCompatibilityInspection/importElement.py
@@ -1 +1 @@
-import <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not have module Bastion">Bastion</warning>
\ No newline at end of file
+import <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not have module Bastion">Bastion</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/importStatement.py b/python/testData/inspections/PyCompatibilityInspection/importStatement.py
index 7e08386f4719..f4e94718e74f 100644
--- a/python/testData/inspections/PyCompatibilityInspection/importStatement.py
+++ b/python/testData/inspections/PyCompatibilityInspection/importStatement.py
@@ -1,3 +1,5 @@
-<error descr="Python version 2.7 does not have module builtins"><warning descr="Python version 2.4, 2.5, 2.6, 2.7 do not have module builtins">import builtins</warning></error>
+<error descr="Python version 2.7 does not have module builtins"><warning descr="Python version 2.4, 2.5, 2.6, 2.7 do not have module builtins">
+</warning></error>
 
-<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not have module __builtin__">import __builtin__</warning>
\ No newline at end of file
+<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not have module __builtin__">
+</warning>
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/listCompExpression.py b/python/testData/inspections/PyCompatibilityInspection/listCompExpression.py
index 3891ea018954..35935b7dbc49 100644
--- a/python/testData/inspections/PyCompatibilityInspection/listCompExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/listCompExpression.py
@@ -1 +1 @@
-var = [x for x in <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support this syntax in list comprehensions.">1, 2, 3</warning>]
\ No newline at end of file
+var = [x for x in <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support this syntax in list comprehensions.">1, 2, 3</warning>]
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/numericLiteralExpression.py b/python/testData/inspections/PyCompatibilityInspection/numericLiteralExpression.py
index 216ed0a98711..c1e5f4f214aa 100644
--- a/python/testData/inspections/PyCompatibilityInspection/numericLiteralExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/numericLiteralExpression.py
@@ -1,2 +1,2 @@
-a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support a trailing 'l' or 'L'.">12l</warning>
-v = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support this syntax. It requires '0o' prefix for octal literals">04</warning><error descr="End of statement expected">8</error>
\ No newline at end of file
+a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a trailing 'l' or 'L'.">12l</warning>
+v = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support this syntax. It requires '0o' prefix for octal literals">04</warning><error descr="End of statement expected">8</error>
\ No newline at end of file
diff --git a/python/testData/inspections/PyCompatibilityInspection/raiseStatement.py b/python/testData/inspections/PyCompatibilityInspection/raiseStatement.py
index e6f1569259dd..45acce8f6261 100644
--- a/python/testData/inspections/PyCompatibilityInspection/raiseStatement.py
+++ b/python/testData/inspections/PyCompatibilityInspection/raiseStatement.py
@@ -1,6 +1,6 @@
 try:
     a
 except :
-    <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support this syntax.">raise ImportError, ImportWarning</warning>
+    <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support this syntax.">raise ImportError, ImportWarning</warning>
 
-<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support this syntax. Raise with no arguments can only be used in an except block">raise</warning>
+<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support this syntax. Raise with no arguments can only be used in an except block">raise</warning>
diff --git a/python/testData/inspections/PyCompatibilityInspection/reprExpression.py b/python/testData/inspections/PyCompatibilityInspection/reprExpression.py
index 1b3146475795..f7037e109c27 100644
--- a/python/testData/inspections/PyCompatibilityInspection/reprExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/reprExpression.py
@@ -1 +1 @@
-a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support backquotes, use repr() instead">`imp.acquire_lock()`</warning>
+a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support backquotes, use repr() instead">`imp.acquire_lock()`</warning>
diff --git a/python/testData/inspections/PyCompatibilityInspection/stringLiteralExpression.py b/python/testData/inspections/PyCompatibilityInspection/stringLiteralExpression.py
index 9a882a3575ae..174250b11e37 100644
--- a/python/testData/inspections/PyCompatibilityInspection/stringLiteralExpression.py
+++ b/python/testData/inspections/PyCompatibilityInspection/stringLiteralExpression.py
@@ -23,7 +23,7 @@ a = <warning descr="Python version 2.4, 2.5 do not support a 'B' prefix">b</warn
 
 a = <warning descr="Python version 3.0, 3.1, 3.2 do not support a 'U' prefix">u</warning>""
 a = r""
-a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support a 'UR' prefix">ur</warning>""
+a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a 'UR' prefix">ur</warning>""
 a = <warning descr="Python version 2.4, 2.5 do not support a 'B' prefix">b</warning>""
 a = <warning descr="Python version 2.4, 2.5, 3.0 do not support a 'BR' prefix">br</warning>""
 
@@ -31,12 +31,12 @@ a = <warning descr="Python version 2.4, 2.5, 3.0 do not support a 'BR' prefix">b
 
 a = <warning descr="Python version 3.0, 3.1, 3.2 do not support a 'U' prefix">u</warning>""
 a = r""
-a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support a 'UR' prefix">ur</warning>""
+a = <warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a 'UR' prefix">ur</warning>""
 
 # combined
 b = <warning descr="Python version 3.0, 3.1, 3.2 do not support a 'U' prefix">u</warning>"" <warning descr="Python version 2.4, 2.5 do not support a 'B' prefix">b</warning>""
 
 # never was available
-a = <error descr="Python version 2.7 does not support a 'RR' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4 do not support a 'RR' prefix">rr</warning></error>""
-a = <error descr="Python version 2.7 does not support a 'BB' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4 do not support a 'BB' prefix">bb</warning></error>""
-a = <error descr="Python version 2.7 does not support a 'UU' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4 do not support a 'UU' prefix">uu</warning></error>""
\ No newline at end of file
+a = <error descr="Python version 2.7 does not support a 'RR' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a 'RR' prefix">rr</warning></error>""
+a = <error descr="Python version 2.7 does not support a 'BB' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a 'BB' prefix">bb</warning></error>""
+a = <error descr="Python version 2.7 does not support a 'UU' prefix"><warning descr="Python version 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support a 'UU' prefix">uu</warning></error>""
\ No newline at end of file
diff --git a/python/testData/inspections/ReplaceNotEqOperator.py b/python/testData/inspections/ReplaceNotEqOperator.py
index 790a765f19ca..97e2a27b5267 100644
--- a/python/testData/inspections/ReplaceNotEqOperator.py
+++ b/python/testData/inspections/ReplaceNotEqOperator.py
@@ -1 +1 @@
-print(<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4 do not support <>, use != instead.">a<caret> <> b</warning>)
\ No newline at end of file
+print(<warning descr="Python version 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 do not support <>, use != instead.">a<caret> <> b</warning>)
\ No newline at end of file