diff --git a/extra/example.py b/extra/example.py index 18066f75639ee19bd6ac9a28cbd0473b743f4c8e..e6782ca6fc42b5325e98644363a37503a563d09a 100644 --- a/extra/example.py +++ b/extra/example.py @@ -65,11 +65,11 @@ class Printer(object): def handle_connect(self, server): """ Called when we connect to the server """ - self.prnt("I have connected to %s" % server) + self.prnt("I have connected to " + server) def handle_disconnect(self, server): """ Called when we disconnect from the server """ - self.prnt("I have disconnected from %s" % server) + self.prnt("I have disconnected from " + server) def handle_message(self, channel, user, message): """ Called when a message is received """ diff --git a/extra/rss.py b/extra/rss.py index 3bac4b1d5342c66cd8072a22329312af93d2ad73..e508d371389ff615187b64a8e44712fedee7fc53 100644 --- a/extra/rss.py +++ b/extra/rss.py @@ -76,7 +76,7 @@ class Rss(object): elif (cmd == 'rss-list'): cursor.execute('''SELECT url FROM rss WHERE network = ? and channel = ?''', (self.network, channel)) for my_url in cursor.fetchall(): - self.server.doMessage(channel, "RSS item: %s" % my_url[0]) + self.server.doMessage(channel, "RSS item: " + my_url[0]) elif (cmd == 'rss-del'): url = args[0] cursor.execute('''SELECT url FROM rss WHERE network = ? and channel = ? and url = ?''', (self.network, channel, url)) @@ -85,7 +85,7 @@ class Rss(object): else: try: cursor.execute('''DELETE FROM rss WHERE network = ? and channel = ? and url = ?''', (self.network, channel, url)) - self.server.doMessage(channel, "%s RSS feed removed" % url) + self.server.doMessage(channel, url + " RSS feed removed") connection.commit() except sqlite3.Error as e: self.server.doMessage(channel, "Error: %s RSS feed not removed (%s)" % (args[0], e.args[0])) diff --git a/extra/wikinews.py b/extra/wikinews.py index ae5bb20f9f428ef82737536d935a1d9d27de3049..2a472fda1de2c9d89326069b220bc5d8070fd3ae 100644 --- a/extra/wikinews.py +++ b/extra/wikinews.py @@ -97,7 +97,7 @@ class wikinews(object): return pageUrl = bytes(pageUrl, "utf-8").decode("unicode_escape") urlsList.append(pageUrl) - self.server.doMessage(channel, "%s" % " ".join(urlsList)) + self.server.doMessage(channel, " ".join(urlsList)) def checkNewEntries(self): try: response = urllib.request.urlopen(self.url).read() diff --git a/guppy b/guppy index a9c377c4245305768561aa26598f7e0e947174df..fe21221491f21fcfaf6624260721e194db580e64 100755 --- a/guppy +++ b/guppy @@ -45,7 +45,7 @@ class main(object): print(" |___/ |_| |_| |___/ version " + self.version) print("PID: " + str(os.getpid())) self.directory = self.homedir + '/conf/' - print(("Settings directory: %s" % self.directory)) + print("Settings directory: " + self.directory) if not os.path.exists(self.directory): os.makedirs(self.directory) diff --git a/irc.py b/irc.py index e6a0301fe242e2a95f30b709adc753023594cbc1..33c4ab824de21e504ec4ea06a3abe303e418a941 100644 --- a/irc.py +++ b/irc.py @@ -204,7 +204,7 @@ class IRC(asynchat.async_chat): try: self.connect(self.tup) except ssl.SSLError as error: - self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: %s' % error) + self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: ' + error) return except socket.error as error: self.prnt('There was an error connecting to %s. %s' % (self.config["host"], error)) diff --git a/plugins/rss.py b/plugins/rss.py index fe190b59173bd529e9d2819efcd1306868f3c1f4..80f8d8c28cf5a6a05c1c21ec158746906fb34370 100644 --- a/plugins/rss.py +++ b/plugins/rss.py @@ -76,7 +76,7 @@ class Rss(object): elif (cmd == 'rss-list'): cursor.execute('''SELECT url FROM rss WHERE network = ? and channel = ?''', (self.network, channel)) for my_url in cursor.fetchall(): - self.server.doMessage(channel, "RSS item: %s" % my_url[0]) + self.server.doMessage(channel, "RSS item: " + my_url[0]) elif (cmd == 'rss-del'): url = args[0] cursor.execute('''SELECT url FROM rss WHERE network = ? and channel = ? and url = ?''', (self.network, channel, url)) @@ -85,7 +85,7 @@ class Rss(object): else: try: cursor.execute('''DELETE FROM rss WHERE network = ? and channel = ? and url = ?''', (self.network, channel, url)) - self.server.doMessage(channel, "%s RSS feed removed" % url) + self.server.doMessage(channel, url + " RSS feed removed") connection.commit() except sqlite3.Error as e: self.server.doMessage(channel, "Error: %s RSS feed not removed (%s)" % (args[0], e.args[0]))