Initial support for python3 #172
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Not backwards compatible, but possibly could be should someone want to take that on. Modules changed to python3 specific.
robgil
commented
Dec 26, 2017
| @@ -1,4 +1,4 @@ | |||
| import ConfigParser | |||
| import configparser as ConfigParser | |||
There was a problem hiding this comment.
Could be switched to a try/except to be backwards compatible
| @@ -11,7 +11,7 @@ | |||
| import unicodecsv | |||
| import threading | |||
| from logger import get_logger | |||
| from Queue import Queue | |||
| import queue as Queue | |||
There was a problem hiding this comment.
The module changed here, but just aliased. Again, try/except if you want backwards compatible.
| @@ -21,8 +21,8 @@ | |||
| import os | |||
| import sys | |||
| import time | |||
| import urllib2 | |||
| from cStringIO import StringIO | |||
| @@ -70,25 +70,25 @@ def _query(self, path): | |||
| url = '%s/lookup/%s' % (self.server, path) | |||
| if self.limit: | |||
| url += '?limit=%d' % self.limit | |||
| req = urllib2.Request(url) | |||
| @@ -23,14 +23,14 @@ def reap(file_name): | |||
| outbound_url_file = config.get('Reaper', 'outbound_urls') | |||
|
|
|||
| try: | |||
| with open(inbound_url_file, 'rb') as f: | |||
| with open(inbound_url_file, 'r') as f: | |||
There was a problem hiding this comment.
Since we're reading string, we need to turn off binary for python3.
| @@ -9,5 +9,6 @@ netaddr>=0.7.12,<0.8.0 | |||
| pygeoip>=0.3.1,<0.4.0 | |||
| requests>=2.10.0,<3.0.0 | |||
| sortedcontainers>=0.9.4,<1.6.0 | |||
| wsgiref==0.1.2 | |||
There was a problem hiding this comment.
This is unused anywhere and everything works without it.
| unicodecsv>=0.9.4,<0.15.0 | ||
| urllib3 | ||
| configparser |
| unicodecsv>=0.9.4,<0.15.0 | ||
| urllib3 |
| @@ -102,7 +100,7 @@ def process_packetmail(response, source, direction): | |||
| data = [] | |||
| filter_comments = lambda x: not x[0].startswith('#') | |||
| try: | |||
| for line in ifilter(filter_comments, | |||
| for line in filter(filter_comments, | |||
There was a problem hiding this comment.
filter is now a builtin and replaces itertools.ifilter. Not sure how we'd make this backward compatible.
|
Hi, do you have the modified script for py3? or any place where thr is documentation on how to install it correctly. |
|
@ptester87 its in my fork. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not backwards compatible, but possibly could be should someone want to
take that on.
Modules changed to python3 specific.
Ref #171