From 118cb7cadc5d29ea87fdf379927c69e2d3a5ab90 Mon Sep 17 00:00:00 2001 From: Alfredos-Panagiotis Damkalis Date: Tue, 7 Jul 2020 14:29:57 +0300 Subject: [PATCH] Remove python 2 compatibility code Signed-off-by: Alfredos-Panagiotis Damkalis --- auth0login/admin.py | 3 --- auth0login/apps.py | 3 --- auth0login/models.py | 3 --- auth0login/tests.py | 3 --- auth0login/views.py | 2 -- db/__init__.py | 2 -- db/api/perms.py | 2 -- db/base/migrations/0001_initial.py | 3 --- db/base/migrations/0001_squashed_0009_auto_20180103_1931.py | 2 -- db/base/migrations/0002_auto_20150908_2054.py | 3 --- db/base/migrations/0002_demoddata_is_decoded.py | 2 -- db/base/migrations/0003_auto_20160504_2104.py | 2 -- db/base/migrations/0003_satellite_tle_source.py | 2 -- db/base/migrations/0004_auto_20170302_1641.py | 2 -- db/base/migrations/0004_auto_20181215_1130.py | 2 -- db/base/migrations/0005_demoddata_observer.py | 2 -- db/base/migrations/0005_satellite_decayed.py | 2 -- db/base/migrations/0006_auto_20170323_1715.py | 2 -- db/base/migrations/0006_auto_20190121_1320.py | 2 -- db/base/migrations/0007_satellite_status.py | 2 -- db/base/migrations/0007_transmitter_rename.py | 2 -- db/base/migrations/0008_satellite_description.py | 2 -- db/base/migrations/0008_transmitter_model_change.py | 2 -- db/base/migrations/0009_auto_20180103_1931.py | 2 -- db/base/migrations/0009_auto_20190420_2306.py | 2 -- db/base/migrations/0010_auto_20190421_0143.py | 2 -- db/base/migrations/0011_transmitterentry_service.py | 2 -- docs/conf.py | 2 -- satnogs-db-api-client/versioneer.py | 1 - versioneer.py | 1 - 30 files changed, 64 deletions(-) diff --git a/auth0login/admin.py b/auth0login/admin.py index 4bf1c32..e2fe976 100644 --- a/auth0login/admin.py +++ b/auth0login/admin.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """SatNOGS DB Auth0 login module admin class""" -from __future__ import unicode_literals - # from django.contrib import admin # Register your models here. diff --git a/auth0login/apps.py b/auth0login/apps.py index 17db207..9787bb2 100644 --- a/auth0login/apps.py +++ b/auth0login/apps.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """SatNOGS DB Auth0 login app config""" -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/auth0login/models.py b/auth0login/models.py index 9885620..5434214 100644 --- a/auth0login/models.py +++ b/auth0login/models.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """SatNOGS DB Auth0 login module models""" -from __future__ import unicode_literals - # from django.db import models # Create your models here. diff --git a/auth0login/tests.py b/auth0login/tests.py index c3a3dc8..b6e5434 100644 --- a/auth0login/tests.py +++ b/auth0login/tests.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """SatNOGS DB Auth0 login module test suites""" -from __future__ import unicode_literals - # from django.test import TestCase # Create your tests here. diff --git a/auth0login/views.py b/auth0login/views.py index bc0de3f..4bdc1bc 100644 --- a/auth0login/views.py +++ b/auth0login/views.py @@ -1,6 +1,4 @@ """SatNOGS DB Auth0 login module views""" -from __future__ import unicode_literals - from django.shortcuts import render diff --git a/db/__init__.py b/db/__init__.py index 8b6c6a3..18178a6 100644 --- a/db/__init__.py +++ b/db/__init__.py @@ -1,6 +1,4 @@ """The core django app for SatNOGS DB""" -from __future__ import absolute_import - from ._version import get_versions from .celery import APP as celery_app # noqa diff --git a/db/api/perms.py b/db/api/perms.py index 5b7e9c3..4be0801 100644 --- a/db/api/perms.py +++ b/db/api/perms.py @@ -1,6 +1,4 @@ """SatNOGS DB API permissions, django rest framework""" -from __future__ import absolute_import - from rest_framework import permissions diff --git a/db/base/migrations/0001_initial.py b/db/base/migrations/0001_initial.py index 5674f06..849a662 100644 --- a/db/base/migrations/0001_initial.py +++ b/db/base/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations from django.conf import settings import django.db.models.deletion diff --git a/db/base/migrations/0001_squashed_0009_auto_20180103_1931.py b/db/base/migrations/0001_squashed_0009_auto_20180103_1931.py index f4d7dc3..8f4d62d 100644 --- a/db/base/migrations/0001_squashed_0009_auto_20180103_1931.py +++ b/db/base/migrations/0001_squashed_0009_auto_20180103_1931.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.7 on 2018-01-07 12:40 -from __future__ import unicode_literals import db.base.models from django.conf import settings diff --git a/db/base/migrations/0002_auto_20150908_2054.py b/db/base/migrations/0002_auto_20150908_2054.py index 43722b0..ac5a90a 100644 --- a/db/base/migrations/0002_auto_20150908_2054.py +++ b/db/base/migrations/0002_auto_20150908_2054.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/db/base/migrations/0002_demoddata_is_decoded.py b/db/base/migrations/0002_demoddata_is_decoded.py index 5e7f7cb..43808bf 100644 --- a/db/base/migrations/0002_demoddata_is_decoded.py +++ b/db/base/migrations/0002_demoddata_is_decoded.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-04 08:50 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0003_auto_20160504_2104.py b/db/base/migrations/0003_auto_20160504_2104.py index 3ba4d6a..aece79d 100644 --- a/db/base/migrations/0003_auto_20160504_2104.py +++ b/db/base/migrations/0003_auto_20160504_2104.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-04 21:04 -from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion diff --git a/db/base/migrations/0003_satellite_tle_source.py b/db/base/migrations/0003_satellite_tle_source.py index f20d3d9..6337b2b 100644 --- a/db/base/migrations/0003_satellite_tle_source.py +++ b/db/base/migrations/0003_satellite_tle_source.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-09-19 00:28 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0004_auto_20170302_1641.py b/db/base/migrations/0004_auto_20170302_1641.py index b15f851..afd79d1 100644 --- a/db/base/migrations/0004_auto_20170302_1641.py +++ b/db/base/migrations/0004_auto_20170302_1641.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-03-02 16:41 -from __future__ import unicode_literals import db.base.models import django.core.validators diff --git a/db/base/migrations/0004_auto_20181215_1130.py b/db/base/migrations/0004_auto_20181215_1130.py index 0a4f53c..ca37a4d 100644 --- a/db/base/migrations/0004_auto_20181215_1130.py +++ b/db/base/migrations/0004_auto_20181215_1130.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-12-15 11:30 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0005_demoddata_observer.py b/db/base/migrations/0005_demoddata_observer.py index acb0c21..6e6952b 100644 --- a/db/base/migrations/0005_demoddata_observer.py +++ b/db/base/migrations/0005_demoddata_observer.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-14 18:38 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0005_satellite_decayed.py b/db/base/migrations/0005_satellite_decayed.py index 7dca299..a81d8fd 100644 --- a/db/base/migrations/0005_satellite_decayed.py +++ b/db/base/migrations/0005_satellite_decayed.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2019-01-19 16:39 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0006_auto_20170323_1715.py b/db/base/migrations/0006_auto_20170323_1715.py index 4d29f63..f42e816 100644 --- a/db/base/migrations/0006_auto_20170323_1715.py +++ b/db/base/migrations/0006_auto_20170323_1715.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-23 17:15 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0006_auto_20190121_1320.py b/db/base/migrations/0006_auto_20190121_1320.py index 7af9c7d..d4b96fd 100644 --- a/db/base/migrations/0006_auto_20190121_1320.py +++ b/db/base/migrations/0006_auto_20190121_1320.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2019-01-21 13:20 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0007_satellite_status.py b/db/base/migrations/0007_satellite_status.py index a79e98e..e97d9dd 100644 --- a/db/base/migrations/0007_satellite_status.py +++ b/db/base/migrations/0007_satellite_status.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-05-08 15:49 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0007_transmitter_rename.py b/db/base/migrations/0007_transmitter_rename.py index 484dda8..c0a4015 100644 --- a/db/base/migrations/0007_transmitter_rename.py +++ b/db/base/migrations/0007_transmitter_rename.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2019-03-29 19:11 -from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion diff --git a/db/base/migrations/0008_satellite_description.py b/db/base/migrations/0008_satellite_description.py index 1663fd5..d6f55f9 100644 --- a/db/base/migrations/0008_satellite_description.py +++ b/db/base/migrations/0008_satellite_description.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-05-16 21:09 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/db/base/migrations/0008_transmitter_model_change.py b/db/base/migrations/0008_transmitter_model_change.py index 2e5c989..ce571a8 100644 --- a/db/base/migrations/0008_transmitter_model_change.py +++ b/db/base/migrations/0008_transmitter_model_change.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2019-04-04 04:36 -from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models diff --git a/db/base/migrations/0009_auto_20180103_1931.py b/db/base/migrations/0009_auto_20180103_1931.py index 71f3be7..7f7607e 100644 --- a/db/base/migrations/0009_auto_20180103_1931.py +++ b/db/base/migrations/0009_auto_20180103_1931.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.7 on 2018-01-03 19:31 -from __future__ import unicode_literals import os diff --git a/db/base/migrations/0009_auto_20190420_2306.py b/db/base/migrations/0009_auto_20190420_2306.py index f5d8589..4b3f325 100644 --- a/db/base/migrations/0009_auto_20190420_2306.py +++ b/db/base/migrations/0009_auto_20190420_2306.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-20 23:06 -from __future__ import unicode_literals from django.db import migrations diff --git a/db/base/migrations/0010_auto_20190421_0143.py b/db/base/migrations/0010_auto_20190421_0143.py index 6dad7f4..c9c615e 100644 --- a/db/base/migrations/0010_auto_20190421_0143.py +++ b/db/base/migrations/0010_auto_20190421_0143.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-21 01:43 -from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion diff --git a/db/base/migrations/0011_transmitterentry_service.py b/db/base/migrations/0011_transmitterentry_service.py index 4eb9541..4361e94 100644 --- a/db/base/migrations/0011_transmitterentry_service.py +++ b/db/base/migrations/0011_transmitterentry_service.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-07-02 05:59 -from __future__ import unicode_literals from django.db import migrations, models diff --git a/docs/conf.py b/docs/conf.py index a9679f9..58dadb7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # satnogs-db documentation build configuration file, created by # sphinx-quickstart on Fri Dec 19 19:35:32 2014. # diff --git a/satnogs-db-api-client/versioneer.py b/satnogs-db-api-client/versioneer.py index 64fea1c..26bf9a0 100644 --- a/satnogs-db-api-client/versioneer.py +++ b/satnogs-db-api-client/versioneer.py @@ -276,7 +276,6 @@ https://creativecommons.org/publicdomain/zero/1.0/ . """ -from __future__ import print_function try: import configparser except ImportError: diff --git a/versioneer.py b/versioneer.py index 64fea1c..26bf9a0 100644 --- a/versioneer.py +++ b/versioneer.py @@ -276,7 +276,6 @@ https://creativecommons.org/publicdomain/zero/1.0/ . """ -from __future__ import print_function try: import configparser except ImportError: