Open a pull request

.gitignore

@@ -0,0 +1,5 @@
+*.pyc
+.DS_Store
+*~
+*.swp
+__pycache__

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+sudo: false
+cache: pip
+python:
+- 3.5
+- 3.6
+- 3.7
+install:
+- pip install -r requirements.txt
+script:
+- LANG=en_US.UTF-8 nosetests

Dockerfile

@@ -0,0 +1,16 @@
+FROM python:3
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app/
+
+RUN groupadd -r -g 200 bot \
+        && useradd -mr -g bot -u 200 bot
+USER bot
+
+VOLUME ["/home/bot/.phenny"]
+
+CMD ["/usr/src/app/phenny"]

README.md

@@ -0,0 +1,31 @@
+# phenny
+[![Build Status](https://travis-ci.org/mutantmonkey/phenny.png?branch=master)](https://travis-ci.org/mutantmonkey/phenny)
+
+This is phenny, a Python IRC bot. Originally written by Sean B. Palmer, it has
+been ported to Python3.
+
+This version comes with many new modules, IPv6 support, TLS support, and unit
+tests.
+
+Compatibility with existing phenny modules has been mostly retained, but they
+will need to be updated to run on Python3 if they do not already. All of the
+core modules have been ported, removed, or replaced.
+
+## Requirements
+* Python 3.4+
+* [python-requests](http://docs.python-requests.org/en/latest/)
+
+## Installation
+1. Run `./phenny` - this creates a default config file
+2. Edit `~/.phenny/default.py`
+3. Run `./phenny` - this now runs phenny with your settings
+
+Enjoy!
+
+## Testing
+You will need the Python3 versions of `python-nose` and `python-mock`. To run
+the tests, simply run `nosetests3`.
+
+## Authors
+* Sean B. Palmer, http://inamidst.com/sbp/
+* mutantmonkey, http://mutantmonkey.in

__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 __init__.py - Phenny Init Module
 Copyright 2008, Sean B. Palmer, inamidst.com
@@ -7,56 +7,81 @@
 http://inamidst.com/phenny/
 """
 
-import sys, os, time, threading, signal
-import bot
-
-class Watcher(object): 
-   # Cf. http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/496735
-   def __init__(self):
-      self.child = os.fork()
-      if self.child != 0: 
-         self.watch()
-
-   def watch(self):
-      try: os.wait()
-      except KeyboardInterrupt:
-         self.kill()
-      sys.exit()
-
-   def kill(self):
-      try: os.kill(self.child, signal.SIGKILL)
-      except OSError: pass
-
-def run_phenny(config): 
-   if hasattr(config, 'delay'): 
-      delay = config.delay
-   else: delay = 20
-
-   def connect(config): 
-      p = bot.Phenny(config)
-      p.run(config.host, config.port)
-
-   try: Watcher()
-   except Exception, e: 
-      print >> sys.stderr, 'Warning:', e, '(in __init__.py)'
-
-   while True: 
-      try: connect(config)
-      except KeyboardInterrupt: 
-         sys.exit()
-
-      if not isinstance(delay, int): 
-         break
-
-      warning = 'Warning: Disconnected. Reconnecting in %s seconds...' % delay
-      print >> sys.stderr, warning
-      time.sleep(delay)
-
-def run(config): 
-   t = threading.Thread(target=run_phenny, args=(config,))
-   if hasattr(t, 'run'): 
-      t.run()
-   else: t.start()
-
-if __name__ == '__main__': 
-   print __doc__
+import os
+import signal
+import sys
+import threading
+import time
+
+
+class Watcher(object):
+    # Cf. http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/496735
+    def __init__(self):
+        self.child = os.fork()
+        if self.child != 0:
+            signal.signal(signal.SIGTERM, self.sig_term)
+            self.watch()
+
+    def watch(self):
+        try:
+            os.wait()
+        except KeyboardInterrupt:
+            self.kill()
+        sys.exit()
+
+    def kill(self):
+        try:
+            os.kill(self.child, signal.SIGKILL)
+        except OSError:
+            pass
+
+    def sig_term(self, signum, frame):
+        self.kill()
+        sys.exit()
+
+
+def run_phenny(config):
+    if hasattr(config, 'delay'):
+        delay = config.delay
+    else:
+        delay = 20
+
+    def connect(config):
+        import bot
+        p = bot.Phenny(config)
+
+        ssl_context = p.get_ssl_context(config.ca_certs)
+        if config.ssl_cert and config.ssl_key:
+            ssl_context.load_cert_chain(config.ssl_cert, config.ssl_key)
+        p.run(config.host, config.port, config.ssl, config.ipv6, None,
+              ssl_context)
+
+    try:
+        Watcher()
+    except Exception as e:
+        print('Warning:', e, '(in __init__.py)', file=sys.stderr)
+
+    while True:
+        try:
+            connect(config)
+        except KeyboardInterrupt:
+            sys.exit()
+
+        if not isinstance(delay, int):
+            break
+
+        msg = "Warning: Disconnected. Reconnecting in {0} seconds..."
+        print(msg.format(delay), file=sys.stderr)
+        time.sleep(delay)
+
+
+def run(config):
+    t = threading.Thread(target=run_phenny, args=(config,))
+    if hasattr(t, 'run'):
+        t.run()
+    else:
+        t.start()
+
+
+if __name__ == '__main__':
+    print(__doc__)