future imports and remove unicode strings
adds from __future__ import unicode_literals, absolute_import, division, print_function to all files, removes unicode strings from RTD conf.py (none other were found in our codebase) See also https://docs.djangoproject.com/en/1.11/topics/python3/#unicode-literals fixes #290 tested locally in dockermerge-requests/386/head
parent
5433a7a67b
commit
d4fb5189d1
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import django_filters
|
||||
from django_filters import rest_framework as filters
|
||||
from django_filters.rest_framework import FilterSet
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
"""
|
||||
Custom pagination classes for REST framework
|
||||
"""
|
||||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from rest_framework.pagination import PageNumberPagination
|
||||
from rest_framework.response import Response
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from rest_framework import serializers
|
||||
|
||||
from db.base.models import TRANSMITTER_STATUS, DemodData, Mode, Satellite, \
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import pytest
|
||||
from django.test import TestCase
|
||||
from rest_framework import status
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from rest_framework import routers
|
||||
|
||||
from db.api import views
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.files.base import ContentFile
|
||||
from rest_framework import mixins, status, viewsets
|
||||
from rest_framework.parsers import FileUploadParser, FormParser
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from socket import error as socket_error
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.template.loader import render_to_string
|
||||
from satnogsdecoders import __version__ as satnogsdecoders_version
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django import forms
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.cache import cache
|
||||
from rest_framework.authtoken.models import Token
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from db.base.models import DemodData, Satellite, Telemetry
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from db.base.models import Satellite
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import requests
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from db.base.tasks import update_satellite
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.management import call_command
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from db.base.tasks import update_all_tle
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import json
|
||||
import logging
|
||||
from os import path
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import csv
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django import template
|
||||
from django.urls import reverse
|
||||
from django.utils.html import format_html
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import random
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from django.conf.urls import url
|
||||
|
||||
from db.base import views
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import binascii
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import logging
|
||||
|
||||
from _mysql_exceptions import OperationalError
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
from __future__ import absolute_import
|
||||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import os
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import sentry_sdk
|
||||
from decouple import Csv, config
|
||||
from dj_database_url import parse as db_url
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
from allauth import urls as allauth_urls
|
||||
from django.conf import settings
|
||||
from django.conf.urls import include, url
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import os
|
||||
|
||||
from django.core.wsgi import get_wsgi_application
|
||||
|
|
12
docs/conf.py
12
docs/conf.py
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# All configuration values have a default; values that are commented out
|
||||
# serve to show the default.
|
||||
|
||||
from __future__ import unicode_literals, absolute_import, division, print_function
|
||||
import time
|
||||
import sys
|
||||
import os
|
||||
|
@ -44,8 +44,8 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'satnogs-db'
|
||||
copyright = u'2014-%s, Libre Space Foundation' % time.strftime('%Y')
|
||||
project = 'satnogs-db'
|
||||
copyright = '2014-%s, Libre Space Foundation' % time.strftime('%Y')
|
||||
author = 'SatNOGS'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
|
@ -198,7 +198,7 @@ latex_elements = {
|
|||
# (source start file, target name, title,
|
||||
# author, documentclass [howto, manual, or own class]).
|
||||
latex_documents = [
|
||||
(master_doc, 'satnogs-db.tex', u'satnogs-db Documentation',
|
||||
(master_doc, 'satnogs-db.tex', 'satnogs-db Documentation',
|
||||
author, 'manual'),
|
||||
]
|
||||
|
||||
|
@ -228,7 +228,7 @@ latex_documents = [
|
|||
# One entry per manual page. List of tuples
|
||||
# (source start file, name, description, authors, manual section).
|
||||
man_pages = [
|
||||
(master_doc, 'satnogs-db', u'satnogs-db Documentation',
|
||||
(master_doc, 'satnogs-db', 'satnogs-db Documentation',
|
||||
[author], 1)
|
||||
]
|
||||
|
||||
|
@ -242,7 +242,7 @@ man_pages = [
|
|||
# (source start file, target name, title, author,
|
||||
# dir menu entry, description, category)
|
||||
texinfo_documents = [
|
||||
(master_doc, 'satnogs-db', u'satnogs-db Documentation',
|
||||
(master_doc, 'satnogs-db', 'satnogs-db Documentation',
|
||||
author, 'SatNOGS', 'An hollistic, unified, global transmitter database for all satellite transmitters.',
|
||||
'Miscellaneous'),
|
||||
]
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
from __future__ import absolute_import, division, print_function, \
|
||||
unicode_literals
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
|
|
Loading…
Reference in New Issue