From 2350ba9cefba96b1fed1bdc87d5df6dde754864f Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Mon, 25 Apr 2011 15:09:02 -0400 Subject: [PATCH] config/irc_config.py -> config/irc.py; secure_config.py -> secure.py; update in files --- .gitignore | 2 +- config/{irc_config.py => irc.py} | 0 config/{secure_config.py.default => secure.default.py} | 0 irc/commands/afc_status.py | 2 +- irc/commands/chanops.py | 2 +- irc/commands/git.py | 2 +- irc/frontend.py | 4 ++-- irc/watcher.py | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename config/{irc_config.py => irc.py} (100%) rename config/{secure_config.py.default => secure.default.py} (100%) diff --git a/.gitignore b/.gitignore index 3174e35..5fa2d71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.pyc -secure_config.py +config/secure.py diff --git a/config/irc_config.py b/config/irc.py similarity index 100% rename from config/irc_config.py rename to config/irc.py diff --git a/config/secure_config.py.default b/config/secure.default.py similarity index 100% rename from config/secure_config.py.default rename to config/secure.default.py diff --git a/irc/commands/afc_status.py b/irc/commands/afc_status.py index b5cc1b0..615a504 100644 --- a/irc/commands/afc_status.py +++ b/irc/commands/afc_status.py @@ -6,7 +6,7 @@ import json import re import urllib -from config.irc_config import * +from config.irc import * from irc.base_command import BaseCommand class AFCStatus(BaseCommand): diff --git a/irc/commands/chanops.py b/irc/commands/chanops.py index 4dc3f11..0d4382b 100644 --- a/irc/commands/chanops.py +++ b/irc/commands/chanops.py @@ -3,7 +3,7 @@ # Voice/devoice/op/deop users in the channel. from irc.base_command import BaseCommand -from config.irc_config import * +from config.irc import * class ChanOps(BaseCommand): def get_hooks(self): diff --git a/irc/commands/git.py b/irc/commands/git.py index 17de4c9..0b63576 100644 --- a/irc/commands/git.py +++ b/irc/commands/git.py @@ -4,7 +4,7 @@ import shlex, subprocess, re -from config.irc_config import * +from config.irc import * from irc.base_command import BaseCommand class Git(BaseCommand): diff --git a/irc/frontend.py b/irc/frontend.py index f2f2049..6391eeb 100644 --- a/irc/frontend.py +++ b/irc/frontend.py @@ -3,8 +3,8 @@ ## Imports import re -from config.irc_config import * -from config.secure_config import * +from config.irc import * +from config.secure import * from irc import command_handler from irc.connection import Connection diff --git a/irc/watcher.py b/irc/watcher.py index db2c700..cbaac80 100644 --- a/irc/watcher.py +++ b/irc/watcher.py @@ -3,7 +3,7 @@ ## Imports import re -from config.irc_config import * +from config.irc import * from irc.connection import Connection from irc.rc import RC