Skip to content

Commit 0ded3e1

Browse files
committed
Fit system_id_scraper.py for python3
1 parent cdd550a commit 0ded3e1

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
treelib
22
construct
3-
termcolor
3+
termcolor
4+
requests

system_id_scraper.py

+20-17
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
from packaging import version
77
import re
88
import requests
9-
from md5 import md5
9+
10+
def md5(data):
11+
if type(data) is str:
12+
data = bytes(data, encoding='utf-8')
13+
return __import__('hashlib').md5(data).hexdigest()
1014

1115
if len(sys.argv) != 2:
12-
print sys.argv[0] + " [file|URL]"
16+
print(sys.argv[0] + " [file|URL]")
1317
exit(0)
1418

1519
if (sys.argv[1].startswith("http")):
@@ -26,23 +30,22 @@
2630
php_version = re.search('<h1 class="p">PHP Version (.*)', text)
2731

2832
if php_version == None:
29-
print "No PHP version found, is this a phpinfo file?"
33+
print("No PHP version found, is this a phpinfo file?")
3034
exit(0)
3135

3236
php_version = php_version.group(1)
3337
php_greater_74 = (version.parse("7.4.0") < version.parse(php_version.split("-")[0]))
34-
3538
# Zend Extension Build ID
3639
zend_extension_id = re.search('<tr><td class="e">Zend Extension Build </td><td class="v">(.*) </td></tr>', text)
3740
if zend_extension_id == None:
38-
print "No Zend Extension Build found."
41+
print("No Zend Extension Build found.")
3942
exit(0)
4043
zend_extension_id = zend_extension_id.group(1)
4144

4245
# Architecture
4346
architecture = re.search('<tr><td class="e">System </td><td class="v">(.*) </td></tr>', text)
4447
if architecture == None:
45-
print "No System info found."
48+
print("No System info found.")
4649
exit(0)
4750
architecture = architecture.group(1).split()[-1]
4851

@@ -69,17 +72,17 @@
6972

7073

7174
# Logging
72-
print "PHP version : " + php_version
73-
print "Zend Extension ID : " + zend_extension_id
74-
print "Zend Bin ID : " + zend_bin_id
75-
print "Assuming " + architecture + " architecture"
75+
print("PHP version : " + php_version)
76+
print("Zend Extension ID : " + zend_extension_id)
77+
print("Zend Bin ID : " + zend_bin_id)
78+
print("Assuming " + architecture + " architecture")
7679

77-
digest = md5(php_version + zend_extension_id + zend_bin_id).hexdigest()
78-
print "------------"
79-
print "System ID : " + digest
80+
digest = md5(php_version + zend_extension_id + zend_bin_id)
81+
print("------------")
82+
print("System ID : " + digest)
8083

8184
if not php_greater_74:
82-
alt_digest = md5(php_version + zend_extension_id + alt_zend_bin_id).hexdigest()
83-
print "PHP lower than 7.4 detected, an alternate Bin ID is possible:"
84-
print "Alternate Zend Bin ID : " + alt_zend_bin_id
85-
print "Alternate System ID : " + alt_digest
85+
alt_digest = md5(php_version + zend_extension_id + alt_zend_bin_id)
86+
print("PHP lower than 7.4 detected, an alternate Bin ID is possible:")
87+
print("Alternate Zend Bin ID : " + alt_zend_bin_id)
88+
print("Alternate System ID : " + alt_digest)

0 commit comments

Comments
 (0)