From 1a6c2657e05c8452d5f0fda3b4cea33c79e80ede Mon Sep 17 00:00:00 2001 From: Tobias Perschon Date: Fri, 22 Mar 2019 00:19:23 +0100 Subject: [PATCH] inheriting object is no longer necessary in py3 --- Adafruit_Video_Looper/directory.py | 2 +- Adafruit_Video_Looper/hello_video.py | 2 +- Adafruit_Video_Looper/model.py | 2 +- Adafruit_Video_Looper/omxplayer.py | 2 +- Adafruit_Video_Looper/usb_drive.py | 2 +- Adafruit_Video_Looper/usb_drive_mounter.py | 2 +- Adafruit_Video_Looper/video_looper.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Adafruit_Video_Looper/directory.py b/Adafruit_Video_Looper/directory.py index eaca2dd..f0bbcee 100644 --- a/Adafruit_Video_Looper/directory.py +++ b/Adafruit_Video_Looper/directory.py @@ -1,7 +1,7 @@ # Copyright 2015 Adafruit Industries. # Author: Tony DiCola # License: GNU GPLv2, see LICENSE.txt -class DirectoryReader(object): +class DirectoryReader: def __init__(self, config): """Create an instance of a file reader that just reads a single diff --git a/Adafruit_Video_Looper/hello_video.py b/Adafruit_Video_Looper/hello_video.py index f089bae..6e971f0 100644 --- a/Adafruit_Video_Looper/hello_video.py +++ b/Adafruit_Video_Looper/hello_video.py @@ -6,7 +6,7 @@ import subprocess import time -class HelloVideoPlayer(object): +class HelloVideoPlayer: def __init__(self, config): """Create an instance of a video player that runs hello_video.bin in the diff --git a/Adafruit_Video_Looper/model.py b/Adafruit_Video_Looper/model.py index 9e93b48..27db3cd 100644 --- a/Adafruit_Video_Looper/model.py +++ b/Adafruit_Video_Looper/model.py @@ -3,7 +3,7 @@ # License: GNU GPLv2, see LICENSE.txt import random -class Playlist(object): +class Playlist: """Representation of a playlist of movies.""" def __init__(self, movies, is_random): diff --git a/Adafruit_Video_Looper/omxplayer.py b/Adafruit_Video_Looper/omxplayer.py index 5990aa3..99f0496 100644 --- a/Adafruit_Video_Looper/omxplayer.py +++ b/Adafruit_Video_Looper/omxplayer.py @@ -6,7 +6,7 @@ import subprocess import time -class OMXPlayer(object): +class OMXPlayer: def __init__(self, config): """Create an instance of a video player that runs omxplayer in the diff --git a/Adafruit_Video_Looper/usb_drive.py b/Adafruit_Video_Looper/usb_drive.py index 7f47cea..753d9a2 100644 --- a/Adafruit_Video_Looper/usb_drive.py +++ b/Adafruit_Video_Looper/usb_drive.py @@ -6,7 +6,7 @@ import glob from .usb_drive_mounter import USBDriveMounter -class USBDriveReader(object): +class USBDriveReader: def __init__(self, config): """Create an instance of a file reader that uses the USB drive mounter diff --git a/Adafruit_Video_Looper/usb_drive_mounter.py b/Adafruit_Video_Looper/usb_drive_mounter.py index 9a98446..4f1f987 100644 --- a/Adafruit_Video_Looper/usb_drive_mounter.py +++ b/Adafruit_Video_Looper/usb_drive_mounter.py @@ -8,7 +8,7 @@ import time import pyudev -class USBDriveMounter(object): +class USBDriveMounter: """Service for automatically mounting attached USB drives.""" def __init__(self, root='/mnt/usbdrive', readonly=False): diff --git a/Adafruit_Video_Looper/video_looper.py b/Adafruit_Video_Looper/video_looper.py index 73d95c9..2fe07ce 100644 --- a/Adafruit_Video_Looper/video_looper.py +++ b/Adafruit_Video_Looper/video_looper.py @@ -38,7 +38,7 @@ from .model import Playlist # - Future file readers and video players can be provided and referenced in the # config to extend the video player use to read from different file sources # or use different video players. -class VideoLooper(object): +class VideoLooper: def __init__(self, config_path): """Create an instance of the main video looper application class. Must