Merge branch 'master' into remindme-plugin

Author: mezmor

.gitignore

@@ -1,6 +1,7 @@
 .*.swp
 *.pyc
 *.orig
+.tox/
 persist
 config
 config.json
@@ -9,3 +10,10 @@ pep8.py
 .pydevproject
 *.db
 web
+bin/
+lib/
+include/
+local/
+pip-selfcheck.json
+pyvenv/
+

.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+dist: xenial
+language: python
+python:
+  - "2.7"
+  - "3.7"
+install: pip install tox-travis
+script: tox
+

README.creole README.mdREADME.creole renamed to README.md

@@ -1,26 +1,26 @@
-= Skybot =
+# Skybot
 
-==Goals==
+## Goals
 * simplicity
-** little boilerplate
-** minimal magic
+  * little boilerplate
+  *  minimal magic
 * power
-** multithreading
-** automatic reloading
-** extensibility
+  * multithreading
+  * automatic reloading
+  * extensibility
 
-==Features==
+# Features
 * Multithreaded dispatch and the ability to connect to multiple networks at a time.
 * Easy plugin development with automatic reloading and a simple hooking API.
 
-==Requirements==
+# Requirements
 To install dependencies, run:
 
     pip install -r requirements.txt
 
-Skybot runs on Python 2.7.
+Skybot runs on Python 2.7 and Python 3.7.
 
-==License==
+## License
 Skybot is public domain. If you find a way to make money using it, I'll be very impressed.
 
 See LICENSE for precise terms.

bot.py

@@ -1,13 +1,14 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
+from __future__ import print_function
 import os
-import Queue
+import queue
 import sys
 import traceback
 import time
 
 
-class Bot(object):
+class Bot:
     def __init__(self):
         self.conns = {}
         self.persist_dir = os.path.abspath('persist')
@@ -21,38 +22,38 @@ def main():
     sys.path += ['lib']
     os.chdir(os.path.dirname(__file__) or '.')  # do stuff relative to the install directory
 
-    print 'Loading plugins'
+    print('Loading plugins')
 
     # bootstrap the reloader
-    eval(compile(open(os.path.join('core', 'reload.py'), 'U').read(),
+    eval(compile(open(os.path.join('core', 'reload.py'), 'r').read(),
                  os.path.join('core', 'reload.py'), 'exec'),
          globals())
     reload(init=True)
 
-    print 'Connecting to IRC'
+    print('Connecting to IRC')
 
     try:
         config()
         if not hasattr(bot, 'config'):
             exit()
-    except Exception, e:
-        print 'ERROR: malformed config file:', e
+    except Exception as e:
+        print('ERROR: malformed config file:', e)
         traceback.print_exc()
         sys.exit()
 
-    print 'Running main loop'
+    print('Running main loop')
 
     while True:
         reload()  # these functions only do things
         config()  # if changes have occured
 
-        for conn in bot.conns.itervalues():
+        for conn in bot.conns.values():
             try:
                 out = conn.out.get_nowait()
                 main(conn, out)
-            except Queue.Empty:
+            except queue.Empty:
                 pass
-        while all(conn.out.empty() for conn in bot.conns.itervalues()):
+        while all(conn.out.empty() for conn in iter(bot.conns.values())):
             time.sleep(.1)
 
 if __name__ == '__main__':

core/config.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import inspect
 import json
 import os
@@ -51,16 +52,19 @@ def config():
         try:
             bot.config = json.load(open(find_config()))
             bot._config_mtime = config_mtime
-            for name, conf in bot.config['connections'].iteritems():
+
+            for name, conf in bot.config['connections'].items():
+                conf.setdefault('censored_strings', bot.config.get('censored_strings', []))
+
                 if name in bot.conns:
                     bot.conns[name].set_conf(conf)
                 else:
                     if conf.get('ssl'):
                         bot.conns[name] = SSLIRC(conf)
                     else:
                         bot.conns[name] = IRC(conf)
-        except ValueError, e:
-            print 'ERROR: malformed config!', e
+        except ValueError as e:
+            print('ERROR: malformed config!', e)
 
 
 bot._config_mtime = 0

core/db.py

@@ -6,7 +6,7 @@ def get_db_connection(conn, name=''):
     "returns an sqlite3 connection to a persistent database"
 
     if not name:
-        name = '%s.%s.db' % (conn.nick, conn.server)
+        name = '%s.%s.db' % (conn.nick, conn.server_host)
 
     filename = os.path.join(bot.persist_dir, name)
     return sqlite3.connect(filename, timeout=10)