1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
--- a/chemspipy/search.py
+++ b/chemspipy/search.py
@@ -15,7 +15,6 @@
import threading
import time
-from six.moves import range
from . import errors, objects, utils
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
long_description=long_description,
keywords='chemistry cheminformatics chemspider rsc rest api',
zip_safe=False,
- install_requires=['requests', 'six'],
+ install_requires=['requests'],
tests_require=['pytest'],
classifiers=[
'Environment :: Console',
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -16,7 +16,6 @@
import time
import pytest
-import six
from chemspipy import ChemSpider, errors
@@ -68,7 +67,7 @@
'averageMass', 'molecularWeight', 'monoisotopicMass'
])
assert isinstance(info['id'], int)
- assert all(isinstance(info[field], six.text_type) for field in [
+ assert all(isinstance(info[field], str) for field in [
'smiles', 'formula', 'commonName', 'mol2D'
])
@@ -85,7 +84,7 @@
'averageMass', 'molecularWeight', 'monoisotopicMass'
])
assert isinstance(info[0]['id'], int)
- assert all(isinstance(info[0][field], six.text_type) for field in [
+ assert all(isinstance(info[0][field], str) for field in [
'smiles', 'formula', 'commonName', 'mol2D'
])
@@ -249,7 +248,7 @@
'averageMass', 'molecularWeight', 'monoisotopicMass'
])
assert isinstance(info['id'], int)
- assert all(isinstance(info[field], six.text_type) for field in [
+ assert all(isinstance(info[field], str) for field in [
'smiles', 'formula', 'commonName', 'mol2D'
])
@@ -267,7 +266,7 @@
'averageMass', 'molecularWeight', 'monoisotopicMass'
])
assert isinstance(info[0]['id'], int)
- assert all(isinstance(info[0][field], six.text_type) for field in [
+ assert all(isinstance(info[0][field], str) for field in [
'smiles', 'formula', 'commonName', 'mol2D'
])
@@ -288,7 +287,7 @@
assert all(isinstance(info[0][field], int) for field in [
'id', 'referenceCount', 'dataSourceCount', 'pubMedCount', 'rscCount'
])
- assert all(isinstance(info[0][field], six.text_type) for field in [
+ assert all(isinstance(info[0][field], str) for field in [
'smiles', 'formula', 'commonName', 'mol2D'
])
@@ -374,7 +373,7 @@
info = cs.get_compound_info(123)
assert all(field in info for field in ['id', 'smiles'])
assert isinstance(info['id'], int)
- assert isinstance(info['smiles'], six.text_type)
+ assert isinstance(info['smiles'], str)
def test_get_compound_thumbnail():
|
