aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulgen301 <tokmajigeorge@gmail.com>2017-03-19 12:40:53 +0100
committerFulgen301 <tokmajigeorge@gmail.com>2017-07-11 11:10:31 +0200
commit611216b5d60faef53adb237bd9865ee795ac4348 (patch)
tree0bf1b34b181ff25735bcfbc75b2faab5e7adf5f6
parentf06f43b2e3b4b680e44e7424a89c38c160102585 (diff)
downloadpycrctrl-611216b5d60faef53adb237bd9865ee795ac4348.tar.gz
pycrctrl-611216b5d60faef53adb237bd9865ee795ac4348.zip
Rename plugins.py to plugin.py to prevent conficts with supybot.plugins
-rw-r--r--pycrctrl/plugin.py (renamed from pycrctrl/plugins.py)0
-rw-r--r--pycrctrl/pycrctrl.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/pycrctrl/plugins.py b/pycrctrl/plugin.py
index d6a43c2..d6a43c2 100644
--- a/pycrctrl/plugins.py
+++ b/pycrctrl/plugin.py
diff --git a/pycrctrl/pycrctrl.py b/pycrctrl/pycrctrl.py
index ab8db4b..70a87a8 100644
--- a/pycrctrl/pycrctrl.py
+++ b/pycrctrl/pycrctrl.py
@@ -31,7 +31,7 @@ import json
import base64
import supybot.log
import supybot.ircmsgs as ircmsgs
-from . import plugins
+from . import plugin
from pickle import Pickler, Unpickler
from PyQt5.QtCore import *