From 1f71a06aeddf13fda8d9ca556b9cb95629b200c2 Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Sat, 15 Feb 2020 17:33:34 +0000 Subject: [PATCH] Remove python2 compat __future__ imports --- contrib/check-events | 1 - qubes/backup.py | 1 - qubes/rngdoc.py | 2 -- qubes/storage/__init__.py | 2 -- qubes/storage/file.py | 2 -- qubes/tools/__init__.py | 2 -- qubes/vm/qubesvm.py | 2 -- 7 files changed, 12 deletions(-) diff --git a/contrib/check-events b/contrib/check-events index 951248da..0d401f18 100755 --- a/contrib/check-events +++ b/contrib/check-events @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function from pprint import pprint import argparse diff --git a/qubes/backup.py b/qubes/backup.py index 118e2a0e..27e511e1 100644 --- a/qubes/backup.py +++ b/qubes/backup.py @@ -19,7 +19,6 @@ # License along with this library; if not, see . # # -from __future__ import unicode_literals import asyncio import datetime diff --git a/qubes/rngdoc.py b/qubes/rngdoc.py index eeb11864..f53f2160 100755 --- a/qubes/rngdoc.py +++ b/qubes/rngdoc.py @@ -19,8 +19,6 @@ # License along with this library; if not, see . # -from __future__ import print_function - import sys import textwrap diff --git a/qubes/storage/__init__.py b/qubes/storage/__init__.py index f71c2a7b..115aea4e 100644 --- a/qubes/storage/__init__.py +++ b/qubes/storage/__init__.py @@ -22,8 +22,6 @@ """ Qubes storage system""" -from __future__ import absolute_import - import inspect import os import os.path diff --git a/qubes/storage/file.py b/qubes/storage/file.py index c4ef05a5..48d0e0f9 100644 --- a/qubes/storage/file.py +++ b/qubes/storage/file.py @@ -22,8 +22,6 @@ ''' This module contains pool implementations backed by file images''' -from __future__ import absolute_import - import os import os.path import re diff --git a/qubes/tools/__init__.py b/qubes/tools/__init__.py index 220a8bd0..8ebc72be 100644 --- a/qubes/tools/__init__.py +++ b/qubes/tools/__init__.py @@ -21,8 +21,6 @@ '''Qubes' command line tools ''' -from __future__ import print_function - import argparse import importlib import logging diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index d30012ee..11ecbeaa 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -20,8 +20,6 @@ # License along with this library; if not, see . # -from __future__ import absolute_import - import asyncio import base64 import grp