diff -Nru python-xkcd-2.4.1/debian/changelog python-xkcd-2.4.2/debian/changelog --- python-xkcd-2.4.1/debian/changelog 2016-12-12 07:26:41.000000000 +0000 +++ python-xkcd-2.4.2/debian/changelog 2017-03-30 06:18:14.000000000 +0000 @@ -1,3 +1,9 @@ +python-xkcd (2.4.2-1) unstable; urgency=medium + + * New upstream release + + -- Gianfranco Costamagna Thu, 30 Mar 2017 08:18:00 +0200 + python-xkcd (2.4.1-1) unstable; urgency=medium * New upstream release diff -Nru python-xkcd-2.4.1/debian/copyright python-xkcd-2.4.2/debian/copyright --- python-xkcd-2.4.1/debian/copyright 2016-12-12 07:26:32.000000000 +0000 +++ python-xkcd-2.4.2/debian/copyright 2017-03-30 06:19:13.000000000 +0000 @@ -1,13 +1,13 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-xkcd Source: https://pypi.python.org/pypi/xkcd/ Files: * -Copyright: 2012-2016 Ben Rosser +Copyright: 2012-2017 Ben Rosser License: MIT Files: debian/* -Copyright: 2015-2016 Gianfranco Costamagna +Copyright: 2015-2017 Gianfranco Costamagna License: MIT License: MIT diff -Nru python-xkcd-2.4.1/docs/source/conf.py python-xkcd-2.4.2/docs/source/conf.py --- python-xkcd-2.4.1/docs/source/conf.py 2016-12-07 01:34:08.000000000 +0000 +++ python-xkcd-2.4.2/docs/source/conf.py 2017-03-26 03:03:10.000000000 +0000 @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '2.4.1' +version = '2.4.2' # The full version, including alpha/beta/rc tags. -release = '2.4.1' +release = '2.4.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -Nru python-xkcd-2.4.1/LICENSE python-xkcd-2.4.2/LICENSE --- python-xkcd-2.4.1/LICENSE 2016-12-07 01:34:08.000000000 +0000 +++ python-xkcd-2.4.2/LICENSE 2017-03-26 03:03:10.000000000 +0000 @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2016 Ben Rosser +Copyright (c) 2012-2017 Ben Rosser Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -Nru python-xkcd-2.4.1/README.md python-xkcd-2.4.2/README.md --- python-xkcd-2.4.1/README.md 2016-12-07 01:34:08.000000000 +0000 +++ python-xkcd-2.4.2/README.md 2017-03-26 03:03:10.000000000 +0000 @@ -1,4 +1,4 @@ -# xkcd v2.4.1 [![Build Status](https://travis-ci.org/TC01/python-xkcd.svg?branch=master)](https://travis-ci.org/TC01/python-xkcd) +# xkcd v2.4.2 [![Build Status](https://travis-ci.org/TC01/python-xkcd.svg?branch=master)](https://travis-ci.org/TC01/python-xkcd) ### A Python interface to xkcd.com @@ -26,6 +26,10 @@ ## Changelog: +### Version 2.4.2: + +* Switched to using HTTPS URLs for all xkcd queries. + ### Version 2.4.1: * Routines that take comic/article numbers (e.g. xkcd.getComic()) now also can take strings containing cardinal numbers. @@ -69,3 +73,4 @@ Contributions from (github users, unless indicated otherwise): * @Kyu +* Tanya Sandoval (@tsando) diff -Nru python-xkcd-2.4.1/setup.py python-xkcd-2.4.2/setup.py --- python-xkcd-2.4.1/setup.py 2016-12-07 01:34:08.000000000 +0000 +++ python-xkcd-2.4.2/setup.py 2017-03-26 03:03:10.000000000 +0000 @@ -26,7 +26,7 @@ # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # http://packaging.python.org/en/latest/tutorial.html#version - version='2.4.1', + version='2.4.2', description="Library to access xkcd.com", long_description=long_description, diff -Nru python-xkcd-2.4.1/xkcd.py python-xkcd-2.4.2/xkcd.py --- python-xkcd-2.4.1/xkcd.py 2016-12-07 01:34:08.000000000 +0000 +++ python-xkcd-2.4.2/xkcd.py 2017-03-26 03:03:10.000000000 +0000 @@ -35,9 +35,9 @@ import html.parser as HTMLParser # Define the URLs as globals. -xkcdUrl = "http://www.xkcd.com/" # The URL for xkcd. -imageUrl = "http://imgs.xkcd.com/comics/" # The root URL for image retrieval. -explanationUrl = "http://explainxkcd.com/" # The URL of the explanation. +xkcdUrl = "https://www.xkcd.com/" # The URL for xkcd. +imageUrl = "https://imgs.xkcd.com/comics/" # The root URL for image retrieval. +explanationUrl = "https://explainxkcd.com/" # The URL of the explanation. archiveUrl = "https://what-if.xkcd.com/archive/" # The What If Archive URL. class WhatIf: @@ -142,7 +142,7 @@ except: num = -1 self.currentWhatIf.number = num - self.currentWhatIf.link = "http:" + link + self.currentWhatIf.link = "https:" + link def handle_data(self, data): # Some cruder parsing to pick out the data. @@ -322,7 +322,7 @@ """ Uses the xkcd JSON API to look up the number of the latest xkcd comic. Returns that number as an integer.""" - xkcd = urllib.urlopen("http://xkcd.com/info.0.json").read() + xkcd = urllib.urlopen("https://xkcd.com/info.0.json").read() xkcdJSON = json.loads(xkcd.decode()) number = xkcdJSON['num'] return number