14
0
Files
python-python-whois/remove-future-requirement.patch

176 lines
5.6 KiB
Diff

Index: python-whois-0.8.0/test/test_main.py
===================================================================
--- python-whois-0.8.0.orig/test/test_main.py
+++ python-whois-0.8.0/test/test_main.py
@@ -1,12 +1,5 @@
# coding=utf-8
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import *
import unittest
from whois import extract_domain
Index: python-whois-0.8.0/test/test_nicclient.py
===================================================================
--- python-whois-0.8.0.orig/test/test_nicclient.py
+++ python-whois-0.8.0/test/test_nicclient.py
@@ -1,12 +1,5 @@
# coding=utf-8
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import *
import unittest
from whois.whois import NICClient
Index: python-whois-0.8.0/test/test_parser.py
===================================================================
--- python-whois-0.8.0.orig/test/test_parser.py
+++ python-whois-0.8.0/test/test_parser.py
@@ -1,11 +1,4 @@
# -*- coding: utf-8 -*-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import *
import unittest
import os
Index: python-whois-0.8.0/whois/__init__.py
===================================================================
--- python-whois-0.8.0.orig/whois/__init__.py
+++ python-whois-0.8.0/whois/__init__.py
@@ -1,12 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from __future__ import division
-from future import standard_library
-standard_library.install_aliases()
-from builtins import *
import re
import sys
import os
Index: python-whois-0.8.0/whois/parser.py
===================================================================
--- python-whois-0.8.0.orig/whois/parser.py
+++ python-whois-0.8.0/whois/parser.py
@@ -6,20 +6,9 @@
# This module is part of python-whois and is released under
# the MIT license: http://www.opensource.org/licenses/mit-license.php
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from future import standard_library
-
import re
from datetime import datetime
import json
-from past.builtins import basestring
-from builtins import str
-from builtins import *
-
-standard_library.install_aliases()
try:
import dateutil.parser as dp
@@ -169,7 +158,7 @@ class WhoisEntry(dict):
def _preprocess(self, attr, value):
value = value.strip()
- if value and isinstance(value, basestring) and not value.isdigit() and '_date' in attr:
+ if value and isinstance(value, str) and not value.isdigit() and '_date' in attr:
# try casting to date format
value = cast_date(
value,
@@ -1050,7 +1039,7 @@ class WhoisBr(WhoisEntry):
def _preprocess(self, attr, value):
value = value.strip()
- if value and isinstance(value, basestring) and '_date' in attr:
+ if value and isinstance(value, str) and '_date' in attr:
# try casting to date format
value = re.findall(r"[\w\s:.-\\/]+", value)[0].strip()
value = cast_date(
Index: python-whois-0.8.0/whois/time_zones.py
===================================================================
--- python-whois-0.8.0.orig/whois/time_zones.py
+++ python-whois-0.8.0/whois/time_zones.py
@@ -1,10 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import *
_tz_string = '''-12 Y
-11 X NUT SST
-10 W CKT HAST HST TAHT TKT
Index: python-whois-0.8.0/whois/whois.py
===================================================================
--- python-whois-0.8.0.orig/whois/whois.py
+++ python-whois-0.8.0/whois/whois.py
@@ -27,21 +27,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
THE SOFTWARE.
"""
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
import os
import optparse
import socket
import sys
import re
-from builtins import object
-from builtins import *
import logging
-standard_library.install_aliases()
logger = logging.getLogger(__name__)
Index: python-whois-0.8.0/setup.py
===================================================================
--- python-whois-0.8.0.orig/setup.py
+++ python-whois-0.8.0/setup.py
@@ -10,9 +10,7 @@ setuptools.setup(
version='0.8.0',
description="Whois querying and parsing of domain registration information.",
long_description=read('README.rst'),
- install_requires=[
- 'future',
- ],
+ install_requires=[],
classifiers=[
'Environment :: Web Environment',
'Intended Audience :: Developers',
@@ -33,8 +31,6 @@ setuptools.setup(
extras_require={
'better date conversion': ["python-dateutil"]
},
- test_suite='nose.collector',
- tests_require=['nose', 'simplejson'],
include_package_data=True,
zip_safe=False
)