Merge branch 'master' into refactor

jedi/api/__init__.py

@@ -335,7 +335,8 @@ class Script(object):
         )
 
         defs = [classes.Definition(self._inference_state, d) for d in set(names)]
-        return helpers.sorted_definitions(defs)
+        # Avoid duplicates
+        return list(set(helpers.sorted_definitions(defs)))
 
     @no_py2_support
     def search(self, string, **kwargs):

jedi/api/file_name.py

@@ -17,6 +17,8 @@ def complete_file_name(inference_state, module_context, start_leaf, quote, strin
     like_name_length = len(os.path.basename(string))
 
     addition = _get_string_additions(module_context, start_leaf)
+    if string.startswith('~'):
+        string = os.path.expanduser(string)
     if addition is None:
         return
     string = addition + string