diff --git a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java index 7d9d4fafe0bd..3565630fff2f 100644 --- a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java +++ b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java @@ -141,7 +141,6 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin defaultSettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; defaultSettings.KEEP_BLANK_LINES_IN_DECLARATIONS = 1; defaultSettings.KEEP_BLANK_LINES_IN_CODE = 1; - defaultSettings.RIGHT_MARGIN = 99; return defaultSettings; } diff --git a/python/testData/inspections/AddCallSuperTypeAnnotationsPreserved_after.py b/python/testData/inspections/AddCallSuperTypeAnnotationsPreserved_after.py index 4bc5578f1ece..fc292e9bbda5 100644 --- a/python/testData/inspections/AddCallSuperTypeAnnotationsPreserved_after.py +++ b/python/testData/inspections/AddCallSuperTypeAnnotationsPreserved_after.py @@ -3,6 +3,5 @@ class A: pass class B(A): - def __init__(self, d: str, a: int, b: float, *args: tuple, e: bytes, c: complex, - **kwargs: dict) -> list: + def __init__(self, d: str, a: int, b: float, *args: tuple, e: bytes, c: complex, **kwargs: dict) -> list: super().__init__(a, b, *args, c=c, **kwargs) \ No newline at end of file diff --git a/python/testData/override/typeAnnotations_after.py b/python/testData/override/typeAnnotations_after.py index f661fc1ed85e..cb87133042aa 100644 --- a/python/testData/override/typeAnnotations_after.py +++ b/python/testData/override/typeAnnotations_after.py @@ -5,8 +5,7 @@ class ArgsTest: comment:str=None, version:int=None): pass class Sub(ArgsTest): - def __init__(self, key: str=None, value: str=None, max_age=None, expires=None, path: str=None, - domain: str=None, secure: bool=False, httponly: bool=False, - sync_expires: bool=True, comment: str=None, version: int=None): - super().__init__(key, value, max_age, expires, path, domain, secure, httponly, - sync_expires, comment, version) + def __init__(self, key: str=None, value: str=None, max_age=None, expires=None, path: str=None, domain: str=None, + secure: bool=False, httponly: bool=False, sync_expires: bool=True, comment: str=None, + version: int=None): + super().__init__(key, value, max_age, expires, path, domain, secure, httponly, sync_expires, comment, version) diff --git a/python/testData/refactoring/introduceVariable/py2862.after.py b/python/testData/refactoring/introduceVariable/py2862.after.py index a094b2ba9ed6..d4d2cf709549 100644 --- a/python/testData/refactoring/introduceVariable/py2862.after.py +++ b/python/testData/refactoring/introduceVariable/py2862.after.py @@ -1,4 +1,3 @@ -a = '/import/' + urllib.quote(projectId) + '/issues?' + urllib.urlencode( - {'assigneeGroup': assigneeGroup}) +a = '/import/' + urllib.quote(projectId) + '/issues?' + urllib.urlencode({'assigneeGroup': assigneeGroup}) response = self._reqXml('PUT', a, xml, 400).toxml().encode('utf-8') \ No newline at end of file