Add SSL support (correctly, this time.)

master
Brendan Molloy 2010-09-12 21:38:51 +10:00
parent 4969c0d603
commit 721aa3577e
1 changed files with 2 additions and 6 deletions

8
phenny
View File

@ -25,8 +25,6 @@ def check_python_version():
def create_default_config(fn): def create_default_config(fn):
f = open(fn, 'w') f = open(fn, 'w')
print >> f, trim("""\ print >> f, trim("""\
import os
nick = 'phenny' nick = 'phenny'
host = 'irc.example.net' host = 'irc.example.net'
port = 6667 port = 6667
@ -48,7 +46,7 @@ def create_default_config(fn):
# Directories to load user modules from # Directories to load user modules from
# e.g. /path/to/my/modules # e.g. /path/to/my/modules
extra = ['os.path.expanduser("~/.phenny/modules")'] extra = []
# Services to load: maps channel names to white or black lists # Services to load: maps channel names to white or black lists
external = { external = {
@ -63,8 +61,7 @@ def create_default_config(fn):
def create_dotdir(dotdir): def create_dotdir(dotdir):
print 'Creating a config directory at ~/.phenny...' print 'Creating a config directory at ~/.phenny...'
try: try: os.mkdir(dotdir)
os.mkdir(dotdir)
except Exception, e: except Exception, e:
print >> sys.stderr, 'There was a problem creating %s:' % dotdir print >> sys.stderr, 'There was a problem creating %s:' % dotdir
print >> sys.stderr, e.__class__, str(e) print >> sys.stderr, e.__class__, str(e)
@ -73,7 +70,6 @@ def create_dotdir(dotdir):
print 'Creating a default config file at ~/.phenny/default.py...' print 'Creating a default config file at ~/.phenny/default.py...'
default = os.path.join(dotdir, 'default.py') default = os.path.join(dotdir, 'default.py')
os.mkdir(os.path.join(dotdir, 'modules'))
create_default_config(default) create_default_config(default)
print 'Done; now you can edit default.py, and run phenny! Enjoy.' print 'Done; now you can edit default.py, and run phenny! Enjoy.'