Reorganize imports

src/__init__.py

@@ -1,4 +1,7 @@
 import argparse
+import datetime
+import time
+
 import botconfig
 from src import settings as var
 
@@ -52,9 +55,6 @@ var.init_db()
 
 # Logger
 
-import datetime
-import time
-
 # replace characters that can't be encoded with '?'
 # since windows likes to use weird encodings by default
 utf8stdout = open(1, 'w', errors="replace", closefd=False) # stdout

src/decorators.py

@@ -7,11 +7,11 @@
 # Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-from oyoyo.parse import parse_nick
 import fnmatch
+
 import botconfig
 import src.settings as var
+from oyoyo.parse import parse_nick
 from src import logger
 
 adminlog = logger(None)

src/handler.py

@@ -1,13 +1,14 @@
 # The bot commands implemented in here are present no matter which module is loaded
 
-import botconfig
-from src import decorators
-import traceback
-from base64 import b64encode
-from oyoyo.parse import parse_nick
+import base64
 import imp
-from src import logger
 import socket
+import traceback
+
+import botconfig
+from oyoyo.parse import parse_nick
+from src import decorators
+from src import logger
 from src import settings as var
 from src import wolfgame
 
@@ -156,7 +157,7 @@ def connect_callback(cli):
                 nick_b = bytes(botconfig.USERNAME if botconfig.USERNAME else botconfig.NICK, "utf-8")
                 pass_b = bytes(botconfig.PASS, "utf-8")
                 secrt_msg = b'\0'.join((nick_b, nick_b, pass_b))
-                cli.send("AUTHENTICATE " + b64encode(secrt_msg).decode("utf-8"))
+                cli.send("AUTHENTICATE " + base64.b64encode(secrt_msg).decode("utf-8"))
 
         @hook("cap")
         def on_cap(cli, svr, mynick, ack, cap):