merge with dev branch

jedi/parsing_representation.py

@@ -38,9 +38,10 @@ from __future__ import with_statement
 import os
 import re
 import tokenizer as tokenize
+from inspect import cleandoc
+from ast import literal_eval
 
-from jedi._compatibility import next, literal_eval, cleandoc, Python3Method, \
-                            encoding, property, unicode, is_py3k
+from jedi._compatibility import next, Python3Method, encoding, unicode, is_py3k
 from jedi import common
 from jedi import debug
 
@@ -1276,12 +1277,13 @@ class Array(Call):
         return zip(self.keys, self.values)
 
     def get_code(self):
-        map = {self.NOARRAY: '(%s)',
-               self.TUPLE: '(%s)',
-               self.LIST: '[%s]',
-               self.DICT: '{%s}',
-               self.SET: '{%s}'
-              }
+        map = {
+            self.NOARRAY: '(%s)',
+            self.TUPLE: '(%s)',
+            self.LIST: '[%s]',
+            self.DICT: '{%s}',
+            self.SET: '{%s}'
+        }
         inner = []
         for i, stmt in enumerate(self.values):
             s = ''