Removed py25 related code (fixes #206)

This commit is contained in:
Danilo Bargen committed 2013-04-27 16:47:40 +02:00
1 parent b06e654b92
commit b3d9b6ce69
13 files changed
+23 -128

No files matched your search

+3 -3
View File
@@ -19,8 +19,9 @@ import re
import tokenizer as tokenize
import sys
import os
from ast import literal_eval
from jedi._compatibility import exec_function, unicode, is_py25, literal_eval
from jedi._compatibility import exec_function, unicode
from jedi import cache
from jedi import parsing
from jedi import parsing_representation as pr
@@ -383,8 +384,7 @@ def source_to_unicode(source, encoding=None):
http://docs.python.org/2/reference/lexical_analysis.html#encoding-\
declarations
"""
byte_mark = '\xef\xbb\xbf' if is_py25 else \
literal_eval(r"b'\xef\xbb\xbf'")
byte_mark = literal_eval(r"b'\xef\xbb\xbf'")
if source.startswith(byte_mark):
# UTF-8 byte-order mark
return 'utf-8'