summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-24 17:52:44 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-26 05:15:19 +0200
commit58b1ab92a117cfcb311bdcb41fe563077ad39500 (patch)
tree1018706be068fa7416ecdf74cf4d10157dfd2398
parent57f6663f3a029945fe7e799d4371131d9a20d306 (diff)
downloadsamba-58b1ab92a117cfcb311bdcb41fe563077ad39500.tar.gz
samba-58b1ab92a117cfcb311bdcb41fe563077ad39500.tar.bz2
samba-58b1ab92a117cfcb311bdcb41fe563077ad39500.zip
Fix import.
(This used to be commit 17231443a0e3b0ebc4b75db3d721fe0b4e1170c6)
-rwxr-xr-xsource4/scripting/python/examples/winreg.py2
-rw-r--r--source4/web_server/swat/__init__.py27
2 files changed, 28 insertions, 1 deletions
diff --git a/source4/scripting/python/examples/winreg.py b/source4/scripting/python/examples/winreg.py
index 19d39e56ab..80b48ecfd7 100755
--- a/source4/scripting/python/examples/winreg.py
+++ b/source4/scripting/python/examples/winreg.py
@@ -11,7 +11,7 @@ import sys
# Find right directory when running from source tree
sys.path.insert(0, "bin/python")
-import winreg
+from samba.dcerpc import winreg
import optparse
import samba.getopt as options
diff --git a/source4/web_server/swat/__init__.py b/source4/web_server/swat/__init__.py
new file mode 100644
index 0000000000..e0d85dbe2c
--- /dev/null
+++ b/source4/web_server/swat/__init__.py
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#
+# Implementation of SWAT that uses WSGI
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+def SWAT(environ, start_response):
+ status = '200 OK'
+ response_headers = [('Content-type','text/plain')]
+ start_response(status, response_headers)
+ return ['Hello world!\n']
+