Fix PY-20800 'Replace with str.format method call' adds additional :s for repr

Remove explicit conversion :s because it is default for strings

python/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java

@@ -164,8 +164,7 @@ public class ConvertFormatOperatorToMethodIntention extends BaseIntentionAction
             out.append(f_width);
           }
           if ("i".equals(f_conversion) || "u".equals(f_conversion)) out.append("d");
-          else if ("r".equals(f_conversion)) out.append("s"); // we want our raw string as a string
-          else if (!"s".equals(f_conversion)) out.append(f_conversion);
+          else if (!"s".equals(f_conversion) && !"r".equals(f_conversion)) out.append(f_conversion);
 
           final int lastIndexOf = out.lastIndexOf(":");
           if (lastIndexOf == out.length() - 1) {

python/testData/intentions/PyConvertFormatOperatorToMethodIntentionTest/multi_after.py

@@ -4,7 +4,7 @@ a = "{n:d} bottles of {what} on the {where}" \
     {n:d} bottles
     of {what}
     """ \
-    r'\n/ take {howmuch!r:s} down \n/' \
+    r'\n/ take {howmuch!r} down \n/' \
     ur"pass it {how:>8}" \
     "{new_n:#d} {{that is, {percent:+3.2f}% less}} " \
     "bottles of {what:>6} on the {where}" \

python/testData/intentions/PyConvertFormatOperatorToMethodIntentionTest/repr.py

@@ -0,0 +1 @@
+print('%r' <caret>% '123')

python/testData/intentions/PyConvertFormatOperatorToMethodIntentionTest/repr_after.py

@@ -0,0 +1 @@
+print('{!r}'.format('123'))

python/testSrc/com/jetbrains/python/intentions/PyConvertFormatOperatorToMethodIntentionTest.java

@@ -63,4 +63,9 @@ public class PyConvertFormatOperatorToMethodIntentionTest extends PyIntentionTes
   public void testBytes() {
     doNegativeTest(PyBundle.message("INTN.replace.with.method"));
   }
+
+  // PY-20800
+  public void testRepr() {
+    doTest(PyBundle.message("INTN.replace.with.method"), LanguageLevel.PYTHON26);
+  }  
 }