From b4b806c77cba1410f157b9300ac2436ffbf385bf Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:55:47 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Version.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 712ba39..c595d09 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,7 +7,7 @@ This is the SpiceBot Update system. import sopel import requests -import json +import feedparser import pkg_resources from .Config import config as botconfig @@ -25,7 +25,7 @@ class BotVersion(): } self.spicebot = { "version_local": None, - "version_local_num": None, + "version_local_num": pkg_resources.get_distribution("sopel-modules.SpiceBot").version, "version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master", "version_online": None, "version_online_num": None, @@ -48,20 +48,8 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - self.spicebot["version_local_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version - self.sopel["version_online_num"] = self.count_repo_commits() - # get actual version number, and commit count, and assemble a version - - def count_repo_commits(self): - commitcount = 0 - try: - page = requests.get(self.spicebot["version_url"]) - result = page.content - jsoncommits = json.loads(result.decode('utf-8')) - commitcount = len(jsoncommits) - except Exception as e: - commitcount = str(e) - return commitcount + feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") + self.sopel["version_online_num"] = len(feedjson) version = BotVersion()