From 610068dde46d68345a560ed44ef3feb59f551781 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Fri, 27 Feb 2015 11:23:53 +0100
Subject: [PATCH] Fix merged array values.

---
 jedi/evaluate/iterable.py | 12 ++++++------
 test/completion/arrays.py |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py
index 6f1de5e0..749d2df7 100644
--- a/jedi/evaluate/iterable.py
+++ b/jedi/evaluate/iterable.py
@@ -29,7 +29,7 @@ from jedi._compatibility import use_metaclass, is_py3, unicode
 from jedi.parser import tree as pr
 from jedi.evaluate import compiled
 from jedi.evaluate import helpers
-from jedi.evaluate.cache import CachedMetaClass, memoize_default, NO_DEFAULT
+from jedi.evaluate.cache import CachedMetaClass, memoize_default
 from jedi.evaluate import analysis
 
 
@@ -206,7 +206,7 @@ class Array(IterableWrapper, ArrayMixin):
     def py__bool__(self):
         return None  # We don't know the length, because of appends.
 
-    @memoize_default(NO_DEFAULT)
+    @memoize_default()
     def get_index_types(self, evaluator, index=()):
         """
         Get the types of a specific index or all, if not given.
@@ -228,7 +228,7 @@ class Array(IterableWrapper, ArrayMixin):
 
         return types if lookup_done else self.values()
 
-    @memoize_default(NO_DEFAULT)
+    @memoize_default()
     def values(self):
         result = unite(self._evaluator.eval_element(v) for v in self._values())
         result += check_array_additions(self._evaluator, self)
@@ -363,12 +363,12 @@ class MergedArray(_FakeArray):
         super(MergedArray, self).__init__(evaluator, arrays, arrays[-1].type)
         self._arrays = arrays
 
-    def get_index_types(self, evaluator, mixed_index):
-        return list(chain(*(a.values() for a in self._arrays)))
-
     def get_exact_index_types(self, mixed_index):
         raise IndexError
 
+    def values(self):
+        return list(chain(*(a.values() for a in self._arrays)))
+
     def __iter__(self):
         for array in self._arrays:
             for a in array:
diff --git a/test/completion/arrays.py b/test/completion/arrays.py
index fa197c37..655738e1 100644
--- a/test/completion/arrays.py
+++ b/test/completion/arrays.py
@@ -352,3 +352,11 @@ def recursion1(foo):
 
 #? int()
 recursion1([1,2])[0]
+
+# -----------------
+# Merged Arrays
+# -----------------
+
+for x in [1] + ['']:
+    #? int() str()
+    x