From c8ac04165d1c9456c8715b189d461af19849c974 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <kyle@fuller.li>
Date: Tue, 11 Aug 2015 22:30:10 +0100
Subject: [PATCH 1/2] Add the pyeval module

---
 modules/modpython/pyeval.py | 79 +++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 modules/modpython/pyeval.py

diff --git a/modules/modpython/pyeval.py b/modules/modpython/pyeval.py
new file mode 100644
index 00000000..f353f264
--- /dev/null
+++ b/modules/modpython/pyeval.py
@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2004-2015 ZNC, see the NOTICE file for details.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+import sys
+import re
+from code import InteractiveInterpreter
+
+import znc
+
+
+class pyeval(znc.Module, InteractiveInterpreter):
+    module_types = [znc.CModInfo.UserModule, znc.CModInfo.NetworkModule]
+    description = 'Evaluates python code'
+
+    def write(self, data):
+        for line in data.split('\n'):
+            if len(line):
+                self.PutModule(line)
+
+    def resetbuffer(self):
+        """Reset the input buffer."""
+        self.buffer = []
+
+    def push(self, line):
+        self.buffer.append(line)
+        source = "\n".join(self.buffer)
+        more = self.runsource(source, self.filename)
+        if not more:
+            self.resetbuffer()
+        return more
+
+    def OnLoad(self, args, message):
+        if not self.GetUser().IsAdmin():
+            message.s = 'You must have admin privileges to load this module.'
+            return False
+
+        self.filename = "<console>"
+        self.resetbuffer()
+        self.locals['znc'] = znc
+        self.locals['module'] = self
+        self.locals['user'] = self.GetUser()
+        self.locals['network'] = self.GetNetwork()
+        self.indent = re.compile(r'^>+')
+
+        return True
+
+    def OnModCommand(self, line):
+        self.locals['client'] = self.GetClient()
+
+        # Hijack sys.stdout.write
+        stdout_write = sys.stdout.write
+        sys.stdout.write = self.write
+
+        m = self.indent.match(line)
+        if m:
+            self.push(('    ' * len(m.group())) + line[len(m.group()):])
+        elif line == ' ' or line == '<':
+            self.push('')
+        else:
+            self.push(line)
+
+        # Revert sys.stdout.write
+        sys.stdout.write = stdout_write
+        del self.locals['client']
+

From 01c73ff5f04e44e401ec73266fb97839eb20cc1d Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sun, 23 Aug 2015 18:18:25 +0100
Subject: [PATCH 2/2] Move pyeval module to the right place.

Also make 'network' work better when pyeval is a user module.
---
 modules/{modpython => }/pyeval.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename modules/{modpython => }/pyeval.py (98%)

diff --git a/modules/modpython/pyeval.py b/modules/pyeval.py
similarity index 98%
rename from modules/modpython/pyeval.py
rename to modules/pyeval.py
index f353f264..a8933488 100644
--- a/modules/modpython/pyeval.py
+++ b/modules/pyeval.py
@@ -53,13 +53,13 @@ class pyeval(znc.Module, InteractiveInterpreter):
         self.locals['znc'] = znc
         self.locals['module'] = self
         self.locals['user'] = self.GetUser()
-        self.locals['network'] = self.GetNetwork()
         self.indent = re.compile(r'^>+')
 
         return True
 
     def OnModCommand(self, line):
         self.locals['client'] = self.GetClient()
+        self.locals['network'] = self.GetNetwork()
 
         # Hijack sys.stdout.write
         stdout_write = sys.stdout.write
@@ -76,4 +76,5 @@ class pyeval(znc.Module, InteractiveInterpreter):
         # Revert sys.stdout.write
         sys.stdout.write = stdout_write
         del self.locals['client']
+        del self.locals['network']