From 32c644b19b09ca0b34bc1cab2e37fc599cb2aa04 Mon Sep 17 00:00:00 2001
From: auscompgeek <david.vo2@gmail.com>
Date: Wed, 17 Apr 2013 13:30:52 +1000
Subject: [PATCH] fix PEP8 E702 (semicolons)
Signed-off-by: Gryllida A <Gryllida@GMAIL.com>
---
extra/ping_server.py | 2 +-
extra/rss.py | 4 ++--
extra/wikinews.py | 20 ++++++++++----------
plugins/info.py | 2 +-
plugins/ping_server.py | 2 +-
plugins/rss.py | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/extra/ping_server.py b/extra/ping_server.py
index d48924f..d6a7142 100644
--- a/extra/ping_server.py
+++ b/extra/ping_server.py
@@ -32,7 +32,7 @@ class Ping_server(object):
self.commands = []
self.loop = True
self.ponged = False
- self.timeLoop = 10;
+ self.timeLoop = 10
def loop(plugin,server):
timeWaited = 0
while self.loop:
diff --git a/extra/rss.py b/extra/rss.py
index 1bdd125..c19c7ef 100644
--- a/extra/rss.py
+++ b/extra/rss.py
@@ -49,7 +49,7 @@ class Rss(object):
self.connection.commit()
print("[DEBUG] [rss] Database created for the first time")
# Set up the thread to check for new feeds.
- self.timeCheckFeeds = 60;
+ self.timeCheckFeeds = 60
def loop(plugin,server):
timeWaited = 0
while self.loop:
@@ -100,7 +100,7 @@ class Rss(object):
request = urllib.request.Request(url, headers = {'user-agent' : 'guppy '+self.server.config["version"]})
s = urllib.request.urlopen(request)
s = s.read()
- root = ET.fromstring(s);
+ root = ET.fromstring(s)
for channel in root:
children = channel.findall('item')
for child in children:
diff --git a/extra/wikinews.py b/extra/wikinews.py
index bea1d18..3e51e6e 100644
--- a/extra/wikinews.py
+++ b/extra/wikinews.py
@@ -84,9 +84,9 @@ class wikinews(object):
try:
data = json.loads(urllib.request.urlopen(url).read().decode("utf8"))['query']
except:
- self.server.prnt("Exception occured, ignoring -- START");
+ self.server.prnt("Exception occured, ignoring -- START")
traceback.print_exc()
- self.server.prnt("Exception occured, ignoring -- END");
+ self.server.prnt("Exception occured, ignoring -- END")
return
if 'pages' in data:
pageUrl = data['pages'].popitem()[1]['fullurl']
@@ -101,9 +101,9 @@ class wikinews(object):
try:
response = urllib.request.urlopen(self.url).read()
except:
- self.server.prnt("Exception occured, ignoring -- START");
+ self.server.prnt("Exception occured, ignoring -- START")
traceback.print_exc()
- self.server.prnt("Exception occured, ignoring -- END");
+ self.server.prnt("Exception occured, ignoring -- END")
return
j = json.loads(response.decode("utf8"))
lastentries = self.lastEntries
@@ -120,9 +120,9 @@ class wikinews(object):
try:
response = urllib.request.urlopen(self.url).read()
except:
- self.server.prnt("Exception occured, ignoring -- START");
+ self.server.prnt("Exception occured, ignoring -- START")
traceback.print_exc()
- self.server.prnt("Exception occured, ignoring -- END");
+ self.server.prnt("Exception occured, ignoring -- END")
return
j = json.loads(response.decode("utf8"))
if(len(j['query']['categorymembers']) > 0):
@@ -136,9 +136,9 @@ class wikinews(object):
fullurl = json.loads(urllib.request.urlopen(url2).read().decode("utf8"))['query']['pages'][str(entry['pageid'])]['fullurl']
fullurl = urllib.request.urlopen("http://tinyurl.com/api-create.php?url="+fullurl).readline().decode('utf8')
except:
- self.server.prnt("Exception occured, ignoring -- START");
+ self.server.prnt("Exception occured, ignoring -- START")
traceback.print_exc()
- self.server.prnt("Exception occured, ignoring -- END");
+ self.server.prnt("Exception occured, ignoring -- END")
return
hoursAgo = datetime.datetime.utcnow() - datetime.datetime.strptime(entry['timestamp'], "%Y-%m-%dT%H:%M:%SZ")
hoursAgo = datetime.timedelta(hoursAgo.days,hoursAgo.seconds)
@@ -148,9 +148,9 @@ class wikinews(object):
try:
response = urllib.request.urlopen(url).read()
except:
- self.server.prnt("Exception occured, ignoring -- START");
+ self.server.prnt("Exception occured, ignoring -- START")
traceback.print_exc()
- self.server.prnt("Exception occured, ignoring -- END");
+ self.server.prnt("Exception occured, ignoring -- END")
return
j = json.loads(response.decode("utf8"))
if(len(j['query']['categorymembers']) > 0):
diff --git a/plugins/info.py b/plugins/info.py
index f583406..d0a7e59 100644
--- a/plugins/info.py
+++ b/plugins/info.py
@@ -142,7 +142,7 @@ class Info(object):
key = " ".join(args).strip(" ").lower()
if (key in self.infodb):
del self.infodb[key]
- self.server.doMessage(channel, "Ok, I forgot what " + key +" is.");
+ self.server.doMessage(channel, "Ok, I forgot what " + key +" is.")
else:
self.server.doMessage(channel, "Sorry, I don't know what " + key + " is.")
if cmd == "what" or cmd == "who":
diff --git a/plugins/ping_server.py b/plugins/ping_server.py
index 846d034..d7c8d20 100644
--- a/plugins/ping_server.py
+++ b/plugins/ping_server.py
@@ -32,7 +32,7 @@ class Ping_server(object):
self.commands = []
self.loop = True
self.ponged = False
- self.timeLoop = 60;
+ self.timeLoop = 60
def loop(plugin,server):
time.sleep(10) # wait for bot to connect to network
timeWaited = 0
diff --git a/plugins/rss.py b/plugins/rss.py
index 966faf8..8ea029c 100644
--- a/plugins/rss.py
+++ b/plugins/rss.py
@@ -49,7 +49,7 @@ class Rss(object):
self.connection.commit()
print("[DEBUG] [rss] Database created for the first time")
# Set up the thread to check for new feeds.
- self.timeCheckFeeds = 60;
+ self.timeCheckFeeds = 60
def loop(plugin,server):
timeWaited = 0
while self.loop:
@@ -100,7 +100,7 @@ class Rss(object):
request = urllib.request.Request(url, headers = {'user-agent' : 'guppy '+self.server.config["version"]})
s = urllib.request.urlopen(request)
s = s.read()
- root = ET.fromstring(s);
+ root = ET.fromstring(s)
for channel in root:
children = channel.findall('item')
for child in children:
--
GitLab