Skip to content

Commit

Permalink
Merge pull request #25 from Emirati/master
Browse files Browse the repository at this point in the history
Fixed installation error in python2
  • Loading branch information
MyKings authored Sep 23, 2019
2 parents 0a31acf + dd1514a commit 9f3b902
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Changelog
=========

## 2019/09/20 (v0.1.5)
- [bugfix] Fixed python2 installation

## 2019/09/01 (v0.1.4)
- [bugfix] Better support for python3 #22

Expand Down
4 changes: 2 additions & 2 deletions masscan/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
from .masscan import *

__author__ = 'MyKings (xsseroot@gmail.com)'
__version__ = '0.1.4'
__last_modification__ = '2019.09.02'
__version__ = '0.1.5'
__last_modification__ = '2019.09.20'

5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
import os
import sys
import io

try:
from setuptools import setup
Expand All @@ -16,10 +17,10 @@
here = os.path.abspath(os.path.dirname(__file__))

if IS_PY2:
with open(os.path.join(here, 'README.rst')) as readme_file:
with io.open(os.path.join(here, 'README.rst')) as readme_file:
long_description = readme_file.read()
else:
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as readme_file:
with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as readme_file:
long_description = readme_file.read()

setup(
Expand Down

0 comments on commit 9f3b902

Please sign in to comment.