Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not import future in python 3 #88

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: '3.6'
python-version: '3.8'
- name: Install requirements
run: pip install flake8 pycodestyle
- name: Check syntax
Expand Down
5 changes: 3 additions & 2 deletions ckanext/archiver/command_celery.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from __future__ import print_function
from future import standard_library
import sys
import os

Expand All @@ -9,7 +8,9 @@

from ckan.lib.cli import CkanCommand

standard_library.install_aliases() # noqa
if sys.version_info.major < 3:
from future import standard_library
standard_library.install_aliases() # noqa


class CeleryCmd(CkanCommand):
Expand Down
7 changes: 6 additions & 1 deletion ckanext/archiver/tasks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import absolute_import
from builtins import str
import os
import sys
import hashlib
import http.client
import requests
Expand All @@ -14,7 +15,11 @@
from time import sleep

from requests.packages import urllib3
from future.moves.urllib.parse import urlparse, urljoin, quote, urlunparse

if sys.version_info.major < 3:
from future.moves.urllib.parse import urlparse, urljoin, quote, urlunparse
else:
from urllib.parse import urlparse, urljoin, quote, urlunparse

from ckan.common import _
from ckan.lib import uploader
Expand Down
7 changes: 6 additions & 1 deletion ckanext/archiver/tests/mock_remote_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@
from threading import Thread
from time import sleep
from wsgiref.simple_server import make_server
from future.moves.urllib.request import urlopen
import socket
import os
import sys
from functools import reduce

if sys.version_info.major < 3:
from future.moves.urllib.request import urlopen
else:
from urllib.request import urlopen


class MockHTTPServer(object):
"""
Expand Down
10 changes: 7 additions & 3 deletions ckanext/archiver/tests/test_archiver.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
import shutil
import tempfile
import json

from future.moves.urllib.parse import quote_plus
from ckan.plugins.toolkit import config
import sys
import pytest

if sys.version_info.major < 3:
from future.moves.urllib.parse import quote_plus
else:
from urllib.parse import quote_plus

from ckan.plugins.toolkit import config
from ckan import model
from ckan import plugins
from ckan.logic import get_action
Expand Down