Hello community, here is the log from the commit of package python-shodan for openSUSE:Factory checked in at 2020-09-21 17:35:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-shodan (Old) and /work/SRC/openSUSE:Factory/.python-shodan.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-shodan" Mon Sep 21 17:35:49 2020 rev:24 rq:835500 version:1.23.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-shodan/python-shodan.changes 2020-05-19 14:58:53.197454219 +0200 +++ /work/SRC/openSUSE:Factory/.python-shodan.new.4249/python-shodan.changes 2020-09-21 17:42:29.704860549 +0200 @@ -1,0 +2,8 @@ +Sat Sep 12 04:51:36 UTC 2020 - Sebastian Wagner <sebix+novell....@sebix.at> + +- update to version 1.23.1: + * Fixed linting errors + * Import ABC from collections.abc for Python 3.10 compatibility (#130). + * Fix invalid escape sequence error, improves ``shodan radar`` output on Python3 (#131). + +------------------------------------------------------------------- Old: ---- shodan-1.23.0.tar.gz New: ---- shodan-1.23.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-shodan.spec ++++++ --- /var/tmp/diff_new_pack.QsjRTd/_old 2020-09-21 17:42:32.328863022 +0200 +++ /var/tmp/diff_new_pack.QsjRTd/_new 2020-09-21 17:42:32.328863022 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %{!?license: %global license %doc} Name: python-shodan -Version: 1.23.0 +Version: 1.23.1 Release: 0 Summary: Python library and command-line utility for Shodan License: MIT ++++++ shodan-1.23.0.tar.gz -> shodan-1.23.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/PKG-INFO new/shodan-1.23.1/PKG-INFO --- old/shodan-1.23.0/PKG-INFO 2020-04-06 22:10:29.000000000 +0200 +++ new/shodan-1.23.1/PKG-INFO 2020-09-08 02:40:48.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: shodan -Version: 1.23.0 +Version: 1.23.1 Summary: Python library and command-line utility for Shodan (https://developer.shodan.io) Home-page: http://github.com/achillean/shodan-python/tree/master Author: John Matherly @@ -29,6 +29,7 @@ - `Manage Email Notifications <https://asciinema.org/a/7WvyDtNxn0YeNU70ozsxvXDmL>`_ - Exploit search API fully implemented - Bulk data downloads + - Access the Shodan DNS DB to view domain information - `Command-line interface <https://cli.shodan.io>`_ .. image:: https://cli.shodan.io/img/shodan-cli-preview.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/README.rst new/shodan-1.23.1/README.rst --- old/shodan-1.23.0/README.rst 2020-04-06 22:03:05.000000000 +0200 +++ new/shodan-1.23.1/README.rst 2020-09-08 02:21:09.000000000 +0200 @@ -21,6 +21,7 @@ - `Manage Email Notifications <https://asciinema.org/a/7WvyDtNxn0YeNU70ozsxvXDmL>`_ - Exploit search API fully implemented - Bulk data downloads +- Access the Shodan DNS DB to view domain information - `Command-line interface <https://cli.shodan.io>`_ .. image:: https://cli.shodan.io/img/shodan-cli-preview.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/setup.py new/shodan-1.23.1/setup.py --- old/shodan-1.23.0/setup.py 2020-04-06 21:29:29.000000000 +0200 +++ new/shodan-1.23.1/setup.py 2020-09-08 02:19:46.000000000 +0200 @@ -9,7 +9,7 @@ setup( name='shodan', - version='1.23.0', + version='1.23.1', description='Python library and command-line utility for Shodan (https://developer.shodan.io)', long_description=README, long_description_content_type='text/x-rst', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/shodan/__main__.py new/shodan-1.23.1/shodan/__main__.py --- old/shodan-1.23.0/shodan/__main__.py 2020-03-18 00:28:27.000000000 +0100 +++ new/shodan-1.23.1/shodan/__main__.py 2020-09-08 02:37:18.000000000 +0200 @@ -59,6 +59,13 @@ # Make "-h" work like "--help" CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) +CONVERTERS = { + 'kml': KmlConverter, + 'csv': CsvConverter, + 'geo.json': GeoJsonConverter, + 'images': ImagesConverter, + 'xlsx': ExcelConverter, +} # Define a basestring type if necessary for Python3 compatibility try: @@ -66,6 +73,7 @@ except NameError: basestring = str + # Define the main entry point for all of our commands # and expose a way for 3rd-party plugins to tie into the Shodan CLI. @with_plugins(iter_entry_points('shodan.cli.plugins')) @@ -81,13 +89,6 @@ main.add_command(scan) -CONVERTERS = { - 'kml': KmlConverter, - 'csv': CsvConverter, - 'geo.json': GeoJsonConverter, - 'images': ImagesConverter, - 'xlsx': ExcelConverter, -} @main.command() @click.option('--fields', help='List of properties to output.', default=None) @click.argument('input', metavar='<input file>') @@ -209,7 +210,7 @@ shodan_dir = os.path.expanduser(SHODAN_CONFIG_DIR) if not os.path.isdir(shodan_dir): try: - os.mkdir(shodan_dir) + os.makedirs(shodan_dir) except OSError: raise click.ClickException('Unable to create directory to store the Shodan API key ({})'.format(shodan_dir)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/shodan/cli/converter/csvc.py new/shodan-1.23.1/shodan/cli/converter/csvc.py --- old/shodan-1.23.0/shodan/cli/converter/csvc.py 2020-03-27 18:11:51.000000000 +0100 +++ new/shodan-1.23.1/shodan/cli/converter/csvc.py 2020-09-08 02:35:25.000000000 +0200 @@ -2,7 +2,13 @@ from .base import Converter from ...helpers import iterate_files -from collections import MutableMapping +try: + # python 3.x: Import ABC from collections.abc + from collections.abc import MutableMapping +except ImportError: + # Python 2.x: Import ABC from collections + from collections import MutableMapping + from csv import writer as csv_writer, excel @@ -45,7 +51,7 @@ ] def process(self, files): - writer = csv_writer(self.fout, dialect=excel) + writer = csv_writer(self.fout, dialect=excel, lineterminator='\n') # Write the header writer.writerow(self.fields) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/shodan/cli/settings.py new/shodan-1.23.1/shodan/cli/settings.py --- old/shodan-1.23.0/shodan/cli/settings.py 2016-12-16 22:10:32.000000000 +0100 +++ new/shodan-1.23.1/shodan/cli/settings.py 2020-09-08 02:37:18.000000000 +0200 @@ -1,5 +1,11 @@ -SHODAN_CONFIG_DIR = '~/.shodan/' +from os import path + +if path.exists(path.expanduser("~/.shodan")): + SHODAN_CONFIG_DIR = '~/.shodan/' +else: + SHODAN_CONFIG_DIR="~/.config/shodan/" + COLORIZE_FIELDS = { 'ip_str': 'green', 'port': 'yellow', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/shodan/cli/worldmap.py new/shodan-1.23.1/shodan/cli/worldmap.py --- old/shodan-1.23.0/shodan/cli/worldmap.py 2020-03-17 23:24:35.000000000 +0100 +++ new/shodan-1.23.1/shodan/cli/worldmap.py 2020-06-23 23:30:50.000000000 +0200 @@ -29,8 +29,7 @@ 'coords': [90.0, -180.0, -90.0, 180.0], # PyLint freaks out about the world map backslashes so ignore those warnings - # pylint: disable=W1401 - 'data': ''' + 'data': r''' . _..::__: ,-"-"._ |7 , _,.__ _.___ _ _<_>`!(._`.`-. / _._ `_ ,_/ ' '-._.---.-.__ .{ " " `-==,',._\{ \ / {) / _ ">_,-' ` mt-2_ @@ -159,7 +158,7 @@ for lat, lon, char, desc, attrs, color in self.data: # to make this work almost everywhere. see http://docs.python.org/2/library/curses.html if desc: - desc = desc.encode(self.encoding, 'ignore') + desc = desc.encode(self.encoding, 'ignore').decode() if items_to_show <= 0: break char_x, char_y = self.latlon_to_coords(lat, lon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.23.0/shodan.egg-info/PKG-INFO new/shodan-1.23.1/shodan.egg-info/PKG-INFO --- old/shodan-1.23.0/shodan.egg-info/PKG-INFO 2020-04-06 22:10:29.000000000 +0200 +++ new/shodan-1.23.1/shodan.egg-info/PKG-INFO 2020-09-08 02:40:48.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: shodan -Version: 1.23.0 +Version: 1.23.1 Summary: Python library and command-line utility for Shodan (https://developer.shodan.io) Home-page: http://github.com/achillean/shodan-python/tree/master Author: John Matherly @@ -29,6 +29,7 @@ - `Manage Email Notifications <https://asciinema.org/a/7WvyDtNxn0YeNU70ozsxvXDmL>`_ - Exploit search API fully implemented - Bulk data downloads + - Access the Shodan DNS DB to view domain information - `Command-line interface <https://cli.shodan.io>`_ .. image:: https://cli.shodan.io/img/shodan-cli-preview.png