From 3dbcef9917fe7ca5eb565f1620e577826d24f11c Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Sun, 28 Apr 2024 10:33:15 -0300 Subject: [PATCH] Remove unused setting (to use py3 print on py2). --- .../ast/codecompletion/PyCodeCompletionInitializer.java | 2 -- .../ast/codecompletion/PyCodeCompletionPreferences.java | 8 -------- .../codecompletion/ui/CodeCompletionPreferencesPage.java | 4 ---- 3 files changed, 14 deletions(-) diff --git a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionInitializer.java b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionInitializer.java index 98f279298e..e48f8f198b 100644 --- a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionInitializer.java +++ b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionInitializer.java @@ -74,8 +74,6 @@ public void initializeDefaultPreferences() { PyCodeCompletionPreferences.DEFAULT_ADD_SPACES_WHEN_NEEDED); node.putBoolean(PyCodeCompletionPreferences.ADD_SPACE_AND_COLON_WHEN_NEEDED, PyCodeCompletionPreferences.DEFAULT_ADD_SPACES_AND_COLON_WHEN_NEEDED); - node.putBoolean(PyCodeCompletionPreferences.FORCE_PY3K_PRINT_ON_PY2, - PyCodeCompletionPreferences.DEFAULT_FORCE_PY3K_PRINT_ON_PY2); node.put(PyCodeCompletionPreferences.KEYWORDS_CODE_COMPLETION, PyCodeCompletionPreferences.DEFAULT_KEYWORDS_CODE_COMPLETION); node.putInt(PyCodeCompletionPreferences.CHARS_FOR_CTX_INSENSITIVE_MODULES_COMPLETION, diff --git a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionPreferences.java b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionPreferences.java index 89e59937cf..e84538b6cf 100644 --- a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionPreferences.java +++ b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/PyCodeCompletionPreferences.java @@ -155,10 +155,7 @@ public static boolean getUseSubstringMatchInCodeCompletion() { public static final boolean DEFAULT_ADD_SPACES_WHEN_NEEDED = false; //Keep current behavior by default public static final String ADD_SPACE_AND_COLON_WHEN_NEEDED = "ADD_SPACE_AND_COLON_WHEN_NEEDED"; - public static final boolean DEFAULT_ADD_SPACES_AND_COLON_WHEN_NEEDED = false; //Keep current behavior by default - public static final String FORCE_PY3K_PRINT_ON_PY2 = "FORCE_PY3K_PRINT_ON_PY2"; - public static final boolean DEFAULT_FORCE_PY3K_PRINT_ON_PY2 = false; public static final String KEYWORDS_CODE_COMPLETION = "KEYWORDS_CODE_COMPLETION"; public static final String DEFAULT_KEYWORDS_CODE_COMPLETION = defaultKeywordsAsString(); @@ -201,11 +198,6 @@ public static boolean addSpaceAndColonWhenNeeded() { .getBoolean(ADD_SPACE_AND_COLON_WHEN_NEEDED, DEFAULT_ADD_SPACES_AND_COLON_WHEN_NEEDED); } - public static boolean forcePy3kPrintOnPy2() { - return PydevPrefs.getEclipsePreferences() - .getBoolean(FORCE_PY3K_PRINT_ON_PY2, DEFAULT_FORCE_PY3K_PRINT_ON_PY2); - } - public static String[] getKeywords() { String keywords = PydevPrefs.getEclipsePreferences() .get(KEYWORDS_CODE_COMPLETION, DEFAULT_KEYWORDS_CODE_COMPLETION); diff --git a/plugins/org.python.pydev/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java b/plugins/org.python.pydev/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java index 710900df7a..5db0d0e829 100644 --- a/plugins/org.python.pydev/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java +++ b/plugins/org.python.pydev/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java @@ -62,10 +62,6 @@ protected void createFieldEditors() { "Add for common cases (e.g.: \"class :\", \"if :\", etc.)?", p)); addField(new LabelFieldEditor("LabelFieldEditor", "", p)); - addField(new BooleanFieldEditor(PyCodeCompletionPreferences.FORCE_PY3K_PRINT_ON_PY2, - "Force print() function on Python 2.x projects?", p)); - addField(new LabelFieldEditor("LabelFieldEditor", "", p)); - addField(new ListEditor(PyCodeCompletionPreferences.KEYWORDS_CODE_COMPLETION, "Tokens to use:", p) { @Override