fix L.map

Author: jph00

fastcore/foundation.py

@@ -321,7 +321,7 @@ def __eq__(self,b):
         if isinstance(b, (str,dict)): return False
         return all_equal(b,self)
 
-    def sorted(self, key=None, reverse=False): return self._new(sorted_ex(self.items, key=key, reverse=reverse))
+    def sorted(self, key=None, reverse=False): return self._new(sorted_ex(self, key=key, reverse=reverse))
     def __iter__(self): return iter(self.items.itertuples() if hasattr(self.items,'iloc') else self.items)
     def __contains__(self,b): return b in self.items
     def __reversed__(self): return self._new(reversed(self.items))
@@ -339,10 +339,10 @@ def split(cls, s, sep=None, maxsplit=-1): return cls(s.split(sep,maxsplit))
     @classmethod
     def range(cls, a, b=None, step=None): return cls(range_of(a, b=b, step=step))
 
-    def map(self, f, *args, gen=False, **kwargs): return self._new(map_ex(self.items, f, *args, gen=gen, **kwargs))
-    def argwhere(self, f, negate=False, **kwargs): return self._new(argwhere(self.items, f, negate, **kwargs))
+    def map(self, f, *args, gen=False, **kwargs): return self._new(map_ex(self, f, *args, gen=gen, **kwargs))
+    def argwhere(self, f, negate=False, **kwargs): return self._new(argwhere(self, f, negate, **kwargs))
     def filter(self, f=noop, negate=False, gen=False, **kwargs):
-        return self._new(filter_ex(self.items, f=f, negate=negate, gen=gen, **kwargs))
+        return self._new(filter_ex(self, f=f, negate=negate, gen=gen, **kwargs))
 
     def unique(self): return L(dict.fromkeys(self).keys())
     def enumerate(self): return L(enumerate(self))

nbs/01_foundation.ipynb

@@ -1708,7 +1708,7 @@
     "        if isinstance(b, (str,dict)): return False\n",
     "        return all_equal(b,self)\n",
     "\n",
-    "    def sorted(self, key=None, reverse=False): return self._new(sorted_ex(self.items, key=key, reverse=reverse))\n",
+    "    def sorted(self, key=None, reverse=False): return self._new(sorted_ex(self, key=key, reverse=reverse))\n",
     "    def __iter__(self): return iter(self.items.itertuples() if hasattr(self.items,'iloc') else self.items)\n",
     "    def __contains__(self,b): return b in self.items\n",
     "    def __reversed__(self): return self._new(reversed(self.items))\n",
@@ -1726,10 +1726,10 @@
     "    @classmethod\n",
     "    def range(cls, a, b=None, step=None): return cls(range_of(a, b=b, step=step))\n",
     "\n",
-    "    def map(self, f, *args, gen=False, **kwargs): return self._new(map_ex(self.items, f, *args, gen=gen, **kwargs))\n",
-    "    def argwhere(self, f, negate=False, **kwargs): return self._new(argwhere(self.items, f, negate, **kwargs))\n",
+    "    def map(self, f, *args, gen=False, **kwargs): return self._new(map_ex(self, f, *args, gen=gen, **kwargs))\n",
+    "    def argwhere(self, f, negate=False, **kwargs): return self._new(argwhere(self, f, negate, **kwargs))\n",
     "    def filter(self, f=noop, negate=False, gen=False, **kwargs):\n",
-    "        return self._new(filter_ex(self.items, f=f, negate=negate, gen=gen, **kwargs))\n",
+    "        return self._new(filter_ex(self, f=f, negate=negate, gen=gen, **kwargs))\n",
     "\n",
     "    def unique(self): return L(dict.fromkeys(self).keys())\n",
     "    def enumerate(self): return L(enumerate(self))\n",
@@ -1964,7 +1964,7 @@
     {
      "data": {
       "text/plain": [
-       "[4, 7, 1]"
+       "['k', 4, 'j']"
       ]
      },
      "execution_count": null,