Merge from 3.x: PR #5553

Fixes #5552
spyder-ide · Oct 24, 2017 · ca0b74d · ca0b74d
2 parents 2d24af6 + b10dc5d
commit ca0b74d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spyder/utils/encoding.py b/spyder/utils/encoding.py
@@ -94,7 +94,7 @@ def to_fs_from_unicode(unic):
 
 # Codecs for working with files and text.
 CODING_RE = re.compile(r"coding[:=]\s*([-\w_.]+)")
-CODECS = ['utf-8', 'iso8859-1',  'iso8859-15', 'ascii', 'koi8-r',
+CODECS = ['utf-8', 'iso8859-1',  'iso8859-15', 'ascii', 'koi8-r', 'cp1251',
           'koi8-u', 'iso8859-2', 'iso8859-3', 'iso8859-4', 'iso8859-5',
           'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9',
           'iso8859-10', 'iso8859-13', 'iso8859-14', 'latin-1',