808         self._load()

   808         self._load()

   809         for p in sorted(itertools.chain(self._dirs, self._files)):

   809         for p in sorted(itertools.chain(self._dirs, self._files)):

   810             if p in self._files:

   810             if p in self._files:

   811                 yield self._subpath(p)

   811                 yield self._subpath(p)

   812             else:

   812             else:

   814                     yield f

   814                     yield f

   815 

   815 

   816     def keys(self):

   816     def keys(self):

   817         return list(self.iterkeys())

   817         return list(self.iterkeys())

   818 

   818