From 21864157fd87362d5143ab66641742bd6e1fa7f4 Mon Sep 17 00:00:00 2001
From: auscompgeek <david.vo2@gmail.com>
Date: Fri, 26 Apr 2013 16:27:51 +1000
Subject: [PATCH] keep me sane: use string concatenation instead of string
formatting where extremely simple
Signed-off-by: Gryllida A <Gryllida@GMAIL.com>
---
extra/example.py | 4 ++--
extra/rss.py | 4 ++--
extra/wikinews.py | 2 +-
guppy | 2 +-
irc.py | 2 +-
plugins/rss.py | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/extra/example.py b/extra/example.py
index 18066f7..e6782ca 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 3bac4b1..e508d37 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 ae5bb20..2a472fd 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 a9c377c..fe21221 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 e6a0301..33c4ab8 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 fe190b5..80f8d8c 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]))
--
GitLab