  
      def load_disk_frames(self):
          """ Load frames from disk """
          logger.debug("Input is separate Frames. Loading images")
          for filename in self.input_images:
              image = read_image(filename, raise_error=False)
              if image is None:
                  continue
              yield filename, image
  
 
</s> remove     def load_disk_frames(self):
        """ Load frames from disk """
 </s> add     def _load_disk_frames(self):
        """ Generator to load frames from a folder of images.

        Yields
        ------
        filename: str
            The filename of the current frame
        image: :class:`numpy.ndarray`
            A single frame
        """ </s> remove         """ Load an image and yield it with it's filename """
        iterator = self.load_video_frames if self.is_video else self.load_disk_frames
 </s> add         """ Generator to load frames from a folder of images or from a video file.

        Yields
        ------
        filename: str
            The filename of the current frame
        image: :class:`numpy.ndarray`
            A single frame
        """
        iterator = self._load_video_frames if self._is_video else self._load_disk_frames </s> remove     def load_video_frames(self):
        """ Return frames from a video file """
 </s> add     def _load_video_frames(self):
        """ Generator to load frames from a video file.

        Yields
        ------
        filename: str
            The filename of the current frame
        image: :class:`numpy.ndarray`
            A single frame
        """ </s> remove         """ load requested image """
 </s> add         """ Obtain a single image for the given filename.

        Parameters
        ----------
        filename: str
            The filename to return the image for

        Returns
        ------
        :class:`numpy.ndarray`
            The image for the requested filename,

        """ </s> remove             input_images = get_image_paths(self.args.input_dir)
 </s> add             input_images = get_image_paths(self._args.input_dir)
        for filename in self._input_images:
  
      def load_disk_frames(self):
          """ Load frames from disk """
          logger.debug("Input is separate Frames. Loading images")
        for filename in self._input_images:
              image = read_image(filename, raise_error=False)
              if image is None:
                  continue
              yield filename, image
  
keep keep keep keep replace keep keep keep keep keep
 Smart Masks to Convert (#957)

- scripts.convert - Use Smart Masks for Convert
    * Make on-the-fly conversion an explicit option

- Move BlurMask to lib.faces_detect

- tools.preview - Fix for smart masks
    * Subclass from tk.Tk
    * Options to lib.gui.control_helper
    *variable cleanup

- lib.logger - Demote more tensorflow deprecation messages

- Documentation:
    * lib.faces_detect.BlurMask
    * plugins.convert.mask
    * lib.convert
    * scripts.convert
    * scripts.fsmedia
    * tools.preview 
scripts/fsmedia.py