Skip to content

Commit aad980c

Browse files
davidetortoiolidavidetortoioli
committed
Added compatibility with Python version older than 2.6
1 parent b72746c commit aad980c

File tree

3 files changed

+39
-31
lines changed

3 files changed

+39
-31
lines changed

‎deepviz/intel.py‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import inspect
22
import requests
3-
import simplejson
4-
53
from deepviz.result import *
64

5+
try:
6+
import json
7+
except:
8+
import simplejson as json
9+
10+
711
URL_INTEL_SEARCH = "https://api.deepviz.com/intel/search"
812
URL_INTEL_IP = "https://api.deepviz.com/intel/network/ip"
913
URL_INTEL_DOMAIN = "https://api.deepviz.com/intel/network/domain"
@@ -33,7 +37,7 @@ def ip_info(self, api_key=None, ip=None, time_delta=None, history=False):
3337
msg = "You must provide one or more IPs in a list"
3438
return Result(status=INPUT_ERROR, msg=msg)
3539

36-
body = simplejson.dumps(
40+
body = json.dumps(
3741
{
3842
"history": _history,
3943
"api_key": api_key,
@@ -42,7 +46,7 @@ def ip_info(self, api_key=None, ip=None, time_delta=None, history=False):
4246
)
4347

4448
if time_delta:
45-
body = simplejson.dumps(
49+
body = json.dumps(
4650
{
4751
"time_delta": time_delta,
4852
"history": _history,
@@ -55,12 +59,12 @@ def ip_info(self, api_key=None, ip=None, time_delta=None, history=False):
5559
except Exception as e:
5660
return Result(status=NETWORK_ERROR, msg="Error while connecting to Deepviz: %s" % e)
5761

58-
data = simplejson.loads(r.content)
62+
data = json.loads(r.content)
5963

6064
if r.status_code == 200:
6165
return Result(status=SUCCESS, msg=data['data'])
6266
else:
63-
data = simplejson.loads(r.content)
67+
data = json.loads(r.content)
6468
if r.status_code >= 500:
6569
return Result(status=SERVER_ERROR, msg="{status_code} - Error while connecting to Deepviz: {errmsg}".format(status_code=r.status_code, errmsg=data['errmsg']))
6670
else:
@@ -91,7 +95,7 @@ def domain_info(self, api_key=None, domain=None, time_delta=None, history=False,
9195
return Result(status=INPUT_ERROR, msg=msg)
9296

9397
if filters:
94-
body = simplejson.dumps(
98+
body = json.dumps(
9599
{
96100
"output_filters": filters,
97101
"history": _history,
@@ -100,7 +104,7 @@ def domain_info(self, api_key=None, domain=None, time_delta=None, history=False,
100104
}
101105
)
102106
else:
103-
body = simplejson.dumps(
107+
body = json.dumps(
104108
{
105109
"history": _history,
106110
"api_key": api_key,
@@ -110,7 +114,7 @@ def domain_info(self, api_key=None, domain=None, time_delta=None, history=False,
110114

111115
elif time_delta:
112116
if filters:
113-
body = simplejson.dumps(
117+
body = json.dumps(
114118
{
115119
"output_filters": filters,
116120
"time_delta": time_delta,
@@ -119,7 +123,7 @@ def domain_info(self, api_key=None, domain=None, time_delta=None, history=False,
119123
}
120124
)
121125
else:
122-
body = simplejson.dumps(
126+
body = json.dumps(
123127
{
124128
"time_delta": time_delta,
125129
"history": _history,
@@ -133,7 +137,7 @@ def domain_info(self, api_key=None, domain=None, time_delta=None, history=False,
133137
msg = "Error while connecting to Deepviz: %s" % e
134138
return Result(status=NETWORK_ERROR, msg=msg)
135139

136-
data = simplejson.loads(r.content)
140+
data = json.loads(r.content)
137141

138142
if r.status_code == 200:
139143
return Result(status=SUCCESS, msg=data['data'])
@@ -153,15 +157,15 @@ def search(self, api_key=None, search_string=None, start_offset=None, elements=N
153157

154158
if start_offset is not None and elements is not None:
155159
result_set = ["start=%d" % start_offset, "rows=%d" % elements]
156-
body = simplejson.dumps(
160+
body = json.dumps(
157161
{
158162
"result_set": result_set,
159163
"string": search_string,
160164
"api_key": api_key,
161165
}
162166
)
163167
else:
164-
body = simplejson.dumps(
168+
body = json.dumps(
165169
{
166170
"string": search_string,
167171
"api_key": api_key,
@@ -173,7 +177,7 @@ def search(self, api_key=None, search_string=None, start_offset=None, elements=N
173177
except Exception as e:
174178
return Result(status=NETWORK_ERROR, msg="Error while connecting to Deepviz: %s" % e)
175179

176-
data = simplejson.loads(r.content)
180+
data = json.loads(r.content)
177181

178182
if r.status_code == 200:
179183
return Result(status=SUCCESS, msg=data['data'])
@@ -213,14 +217,14 @@ def advanced_search(self, api_key=None, sim_hash=None, created_files=None, imp_h
213217
msg = "Value '%s' must be in a string form" % i
214218
return Result(status=INPUT_ERROR, msg=msg)
215219

216-
final_body = simplejson.dumps(body)
220+
final_body = json.dumps(body)
217221

218222
try:
219223
r = requests.post(URL_INTEL_SEARCH_ADVANCED, data=final_body)
220224
except Exception as e:
221225
return Result(status=NETWORK_ERROR, msg="Error while connecting to Deepviz: %s" % e)
222226

223-
data = simplejson.loads(r.content)
227+
data = json.loads(r.content)
224228

225229
if r.status_code == 200:
226230
msg = data['data']

‎deepviz/sandbox.py‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import os
22
import requests
3-
import simplejson
43
from deepviz.result import *
54

5+
try:
6+
import json
7+
except:
8+
import simplejson as json
9+
610
URL_UPLOAD_SAMPLE = "https://api.deepviz.com/sandbox/submit"
711
URL_DOWNLOAD_REPORT = "https://api.deepviz.com/general/report"
812
URL_DOWNLOAD_SAMPLE = "https://api.deepviz.com/sandbox/sample"
@@ -52,11 +56,11 @@ def upload_sample(self, path=None, api_key=None):
5256
return Result(status=NETWORK_ERROR, msg=msg)
5357

5458
if r.status_code == 200:
55-
data = simplejson.loads(r.content)
59+
data = json.loads(r.content)
5660
msg = data['data']
5761
return Result(status=SUCCESS, msg=msg)
5862
else:
59-
data = simplejson.loads(r.content)
63+
data = json.loads(r.content)
6064
if r.status_code >= 500:
6165
return Result(status=SERVER_ERROR, msg="{status_code} - Error while connecting to Deepviz: {errmsg}".format(status_code=r.status_code, errmsg=data['errmsg']))
6266
else:
@@ -114,7 +118,7 @@ def download_sample(self, md5=None, path=None, api_key=None):
114118
msg = "Cannot create file '%s'" % finalpath
115119
return Result(status=INTERNAL_ERROR, msg=msg)
116120

117-
body = simplejson.dumps(
121+
body = json.dumps(
118122
{
119123
"api_key": api_key,
120124
"md5": md5
@@ -129,7 +133,7 @@ def download_sample(self, md5=None, path=None, api_key=None):
129133
_file.close()
130134
return Result(status=SUCCESS, msg="Sample downloaded to '%s'" % finalpath)
131135
else:
132-
data = simplejson.loads(r.content)
136+
data = json.loads(r.content)
133137
if r.status_code >= 500:
134138
return Result(status=SERVER_ERROR, msg="{status_code} - Error while connecting to Deepviz: {errmsg}".format(status_code=r.status_code, errmsg=data['errmsg']))
135139
else:
@@ -143,7 +147,7 @@ def sample_result(self, md5=None, api_key=None):
143147
if not md5:
144148
return Result(status=INPUT_ERROR, msg="MD5 cannot be null or empty String")
145149

146-
body = simplejson.dumps(
150+
body = json.dumps(
147151
{
148152
"api_key": api_key,
149153
"md5": md5,
@@ -155,7 +159,7 @@ def sample_result(self, md5=None, api_key=None):
155159
except Exception as e:
156160
return Result(status=NETWORK_ERROR, msg="Error while connecting to Deepviz: %s" % e)
157161

158-
data = simplejson.loads(r.content)
162+
data = json.loads(r.content)
159163

160164
if r.status_code == 200:
161165
return Result(status=SUCCESS, msg=data['data'])
@@ -174,14 +178,14 @@ def sample_report(self, md5=None, api_key=None, filters=None):
174178
return Result(status=INPUT_ERROR, msg="MD5 cannot be null or empty String")
175179

176180
if not filters:
177-
body = simplejson.dumps(
181+
body = json.dumps(
178182
{
179183
"api_key": api_key,
180184
"md5": md5
181185
}
182186
)
183187
else:
184-
body = simplejson.dumps(
188+
body = json.dumps(
185189
{
186190
"md5": md5,
187191
"api_key": api_key,
@@ -194,7 +198,7 @@ def sample_report(self, md5=None, api_key=None, filters=None):
194198
except Exception as e:
195199
return Result(status=NETWORK_ERROR, msg="Error while connecting to Deepviz: %s" % e)
196200

197-
data = simplejson.loads(r.content)
201+
data = json.loads(r.content)
198202

199203
if r.status_code == 200:
200204
return Result(status=SUCCESS, msg=data['data'])
@@ -212,7 +216,7 @@ def bulk_download_request(self, md5_list=None, api_key=None):
212216
if not md5_list:
213217
return Result(status=INPUT_ERROR, msg="MD5 list empty or invalid")
214218

215-
body = simplejson.dumps(
219+
body = json.dumps(
216220
{
217221
"api_key": api_key,
218222
"hashes": md5_list
@@ -223,7 +227,7 @@ def bulk_download_request(self, md5_list=None, api_key=None):
223227
msg = "Error while connecting to Deepviz. [%s]" % e
224228
return Result(status=NETWORK_ERROR, msg=msg)
225229

226-
data = simplejson.loads(r.content)
230+
data = json.loads(r.content)
227231

228232
if r.status_code == 200:
229233
return Result(status=SUCCESS, msg=data['data'])
@@ -256,7 +260,7 @@ def bulk_download_retrieve(self, id_request=None, path=None, api_key=None):
256260
except Exception as _:
257261
return Result(status=INTERNAL_ERROR, msg="Cannot create file '%s'" % finalpath)
258262

259-
body = simplejson.dumps(
263+
body = json.dumps(
260264
{
261265
"api_key": api_key,
262266
"id_request": str(id_request)
@@ -271,7 +275,7 @@ def bulk_download_retrieve(self, id_request=None, path=None, api_key=None):
271275
_file.close()
272276
return Result(status=SUCCESS, msg="File downloaded to '%s'" % finalpath)
273277
else:
274-
data = simplejson.loads(r.content)
278+
data = json.loads(r.content)
275279
if r.status_code >= 500:
276280
return Result(status=SERVER_ERROR, msg="{status_code} - Error while connecting to Deepviz: {errmsg}".format(status_code=r.status_code, errmsg=data['errmsg']))
277281
else:

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setuptools.setup(
44
name='python-deepviz',
5-
version='1.1.0',
5+
version='1.1.1',
66
author='Saferbytes',
77
author_email='info@saferbytes.it',
88
url="https://github.com/saferbytes/python-deepviz",

0 commit comments

Comments
 (0)