Scary looking python patch; separate the C-module stuff from pure python for the benefit of OSes which keep them separately.

Makefile.am

@@ -110,7 +110,7 @@ include_subdirs :=				\
 	src/libs/calcmd				\
 	src/libs/calcmd/tests			\
 	src/libs/python				\
-	src/libs/python/bongo			\
+	src/libs/python/libbongo		\
 	src/agents/alarm			\
 	src/agents/antispam			\
 	src/agents/avirus			\
@@ -175,7 +175,7 @@ include src/libs/connmgr/Bongo.rules
 include src/libs/calcmd/Bongo.rules
 include src/libs/calcmd/tests/Bongo.rules
 include src/libs/python/Bongo.rules
-include src/libs/python/bongo/Bongo.rules
+include src/libs/python/libbongo/Bongo.rules
 include src/agents/addressbook/Bongo.rules
 include src/agents/alarm/Bongo.rules
 include src/agents/antispam/Bongo.rules

configure.ac

@@ -686,7 +686,7 @@ src/libs/msgapi/Makefile
 src/libs/nmap/Makefile
 src/libs/python/Makefile
 src/libs/python/bongo-python-wrapper
-src/libs/python/bongo/Makefile
+src/libs/python/libbongo/Makefile
 src/libs/python/bongo/Xpl.py
 src/libs/bongoutil/Makefile
 src/libs/bongoutil/tests/Makefile

src/apps/admin/bongo/admintool/AgentCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB, MDBError
 

src/apps/admin/bongo/admintool/CmdUtil.py

@@ -22,7 +22,7 @@ def GetAttributeArgs(*objClasses):
     return args
 
 def GetAgentArgs():
-    from bongo.bootstrap import msgapi
+    from libbongo.bootstrap import msgapi
 
     attrs = {}
 

src/apps/admin/bongo/admintool/DemoCommands.py

@@ -118,7 +118,7 @@ class DemoCommand(Command):
                     store.Flag(uid, DocFlags.Starred, FlagMode.Add)
 
     def ImportCalendars(self, storename, demo) :
-        from bongo.libs import msgapi
+        from libbongo.libs import msgapi
 
         dirname = demopath + "/calendars"
 
@@ -140,7 +140,7 @@ class DemoCommand(Command):
             msgapi.IcsImport(storename, calname, None, "file://" + path, None, None)
 
     def run(self, options, args):
-        from bongo.libs import msgapi
+        from libbongo.libs import msgapi
 
         if len(args) > 0:
             self.print_usage()

src/apps/admin/bongo/admintool/MdbUtil.py

@@ -20,7 +20,7 @@ def GetMdb(options, inSetup=False):
     return MDB(user, options.authpass)
 
 def GetContext(mdbDn, defContext=None):
-    from bongo.libs import msgapi
+    from libbongo.libs import msgapi
 
     if '\\' in mdbDn:
         return mdbDn.rsplit('\\', 1)

src/apps/admin/bongo/admintool/ServerCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 
 import MdbUtil

src/apps/admin/bongo/admintool/SetupCommands.py

@@ -10,7 +10,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB
 

src/apps/admin/bongo/admintool/UserCommands.py

@@ -11,7 +11,7 @@ from bongo.cmdparse import Command
 
 from bongo import Privs, Xpl
 from bongo.admin import Schema, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 from bongo.Console import wrap
 from bongo.MDB import MDB, MDBError
 

src/apps/migrate/bongo-migrate

@@ -26,7 +26,7 @@ from bongo.nmap.NmapClient import DocFlags as NmapDocFlags
 
 from bongo.store.StoreClient import *
 
-from bongo.libs import bongojson, JsonArray, JsonObject, msgapi, cal, bongoutil
+from libbongo.libs import bongojson, JsonArray, JsonObject, msgapi, cal, bongoutil
 
 
 class EventHolder:

src/apps/setup/bongo-setup.py

@@ -25,7 +25,7 @@ import os, random, signal, socket, string, sys
 
 from bongo import Xpl, BongoError, Privs
 from bongo.admin import ManagedSlapd, Util
-from bongo.bootstrap import msgapi
+from libbongo.bootstrap import msgapi
 
 from bongo.Console import wrap
 

src/apps/storetool/bongo/storetool/CalendarCommands.py

@@ -18,7 +18,7 @@ import bongo.table as table
 from bongo.cmdparse import Command
 from bongo.Contact import Contact
 from bongo.BongoError import BongoError
-from bongo.libs import bongojson, msgapi
+from libbongo.libs import bongojson, msgapi
 from bongo.store.StoreClient import DocTypes, StoreClient, CalendarACL
 from bongo.store.QueueClient import QueueClient
 

src/apps/storetool/bongo/storetool/MailCommands.py

@@ -5,7 +5,7 @@ import sys
 
 from bongo.cmdparse import Command
 from bongo.BongoError import BongoError
-from bongo.libs import bongojson, msgapi
+from libbongo.libs import bongojson, msgapi
 from bongo.store.StoreClient import DocTypes, StoreClient
 
 class MailStoreCommand(Command):

src/libs/python/Bongo.rules

@@ -153,6 +153,9 @@ CLEANFILES +=						\
 	src/libs/python/bongo/nmap/*.pyc			\
 	src/libs/python/bongoy/store/*.pyc
 
+src/libs/python/bongo/Xpl.py: $(top_builddir)/config.status src/libs/python/bongo/Xpl.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
 src/libs/python/bongo-python-wrapper: $(top_builddir)/config.status $(srcdir)/src/libs/python/bongo-python-wrapper.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 

src/libs/python/bongo/Bongo.rules

@@ -1,82 +0,0 @@
-# -*- Makefile -*-
-pkgpyexecdir = $(pyexecdir)/bongo
-
-pkgpyexec_LTLIBRARIES :=			\
-	libs.la					\
-	bootstrap.la
-
-libs_la_SOURCES :=				\
-	src/libs/python/bongo/cal.c		\
-	src/libs/python/bongo/calcmd.c		\
-	src/libs/python/bongo/libs.c		\
-	src/libs/python/bongo/libs.h		\
-	src/libs/python/bongo/mdb.c		\
-	src/libs/python/bongo/msgapi.c		\
-	src/libs/python/bongo/msgapi-defs.c	\
-	src/libs/python/bongo/msgapi-defs.h	\
-	src/libs/python/bongo/pybongo.c		\
-	src/libs/python/bongo/pybongo.h		\
-	src/libs/python/bongo/streamio.c		\
-	src/libs/python/bongo/json.c		\
-	src/libs/python/bongo/json.h		\
-	src/libs/python/bongo/bongoutil.c
-
-libs_la_CPPFLAGS := $(AM_CPPFLAGS)		\
-	$(PYTHON_CPPFLAGS)			\
-	$(bongo_CFLAGS)
-
-libs_la_LDFLAGS := -avoid-version -module
-libs_la_LIBADD :=				\
-	$(PYTHON_LIBS)				\
-	libbongocal.la				\
-	libbongocalcmd.la			\
-	libbongoutil.la				\
-	libbongo-json.la				\
-	libbongomdb.la				\
-	libbongomsgapi.la			\
-	libbongostreamio.la
-
-bootstrap_la_SOURCES :=				\
-	src/libs/python/bongo/bootstrap.c	\
-	src/libs/python/bongo/bootstrap.h	\
-	src/libs/python/bongo/mdb.c		\
-	src/libs/python/bongo/msgapi-defs.c	\
-	src/libs/python/bongo/msgapi-defs.h	\
-	src/libs/python/bongo/pybongo.c		\
-	src/libs/python/bongo/pybongo.h
-
-bootstrap_la_CPPFLAGS := $(AM_CPPFLAGS)		\
-	$(PYTHON_CPPFLAGS)			\
-	$(bongo_CFLAGS)
-
-bootstrap_la_LDFLAGS := -avoid-version -module
-bootstrap_la_LIBADD :=				\
-	$(PYTHON_LIBS)				\
-	libbongomdb.la				\
-	libbongomsgapi.la
-
-src/libs/python/bongo/libs.so: libs.la
-	cp .libs/libs.so $@
-
-src/libs/python/bongo/bootstrap.so: bootstrap.la
-	cp .libs/bootstrap.so $@
-
-src/libs/python/bongo/Xpl.py: $(top_builddir)/config.status src/libs/python/bongo/Xpl.py.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-noinst_DATA +=					\
-	src/libs/python/bongo/libs.so		\
-	src/libs/python/bongo/bootstrap.so	\
-	src/libs/python/bongo/Xpl.py
-
-CLEANFILES +=					\
-	src/libs/python/bongo/libs.so		\
-	src/libs/python/bongo/bootstrap.so	\
-	src/libs/python/bongo/Xpl.py
-
-src/libs/python/bongo/all:			\
-	src/libs/python/bongo/libs.so		\
-	src/libs/python/bongo/bootstrap.so	\
-	src/libs/python/bongo/Xpl.py
-
-src/libs/python/bongo/clean: clean

src/libs/python/bongo/CalCmd.py

@@ -1,4 +1,4 @@
-from bongo.libs import calcmd
+from libbongo.libs import calcmd
 from datetime import datetime
 
 class Command:

src/libs/python/bongo/MDB.py

@@ -20,7 +20,7 @@
 #
 #############################################################################
 
-from bongo.bootstrap import mdb
+from libbongo.bootstrap import mdb
 from bongo.BongoError import BongoError
 
 

src/libs/python/bongo/StreamIO.py

@@ -1,4 +1,4 @@
-from bongo.libs import streamio
+from libbongo.libs import streamio
 import cStringIO as StringIO
 
 class Stream:

src/libs/python/bongo/admin/Handler.py

@@ -1,5 +1,5 @@
 import inspect
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 from bongo import MDB
 import BongoSession as Session
 import bongoutil as util

src/libs/python/bongo/admin/User.py

@@ -1,6 +1,6 @@
 import Handler, Mdb, Security, Template, Util
 from bongo import MDB
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 
 def CreateUser(req):
     if not req.fields.has_key('newusername'):

src/libs/python/bongo/admin/Util.py

@@ -21,7 +21,7 @@
 #############################################################################
 
 import os, random, socket
-from bongo.bootstrap import msgapi, mdb
+from libbongo.bootstrap import msgapi, mdb
 from bongo import MDB, Xpl, Privs
 from bongo.admin import Schema
 from xml.dom import minidom, Node
@@ -32,7 +32,7 @@ log = logging.getLogger("bongo.admin.Util")
 
 def AddBongoUser(mdb, context, username, attributes, password = None):
     """Add a User object in the directory."""
-    from bongo.libs import msgapi as MsgApi
+    from libbongo.libs import msgapi as MsgApi
     userobject = username
     required = {}
     if context:
@@ -54,7 +54,7 @@ def AddBongoUser(mdb, context, username, attributes, password = None):
 
 def ModifyBongoUser(mdb, context, username, attributes, password = None):
     """Modify a User object in the directory."""
-    from bongo.libs import msgapi as MsgApi
+    from libbongo.libs import msgapi as MsgApi
     userobject = username
     if context:
         userobject = context + '\\' + username
@@ -70,7 +70,7 @@ def ModifyBongoUser(mdb, context, username, attributes, password = None):
 
 def RemoveBongoUser(mdb, context, username):
     """Remove a User object from the directory."""
-    from bongo.libs import msgapi as MsgApi
+    from libbongo.libs import msgapi as MsgApi
     userobject = username
     if context:
         userobject = context + '\\' + username
@@ -91,7 +91,7 @@ def RemoveBongoUser(mdb, context, username):
 
 def DelegateBongoUser(mdb, context, username, community):
     """Delegate a User object as a community manager."""
-    from bongo.libs import msgapi as MsgApi
+    from libbongo.libs import msgapi as MsgApi
     userobject = username
     if context:
         userobject = context + '\\' + username
@@ -326,7 +326,7 @@ def FindInheritedAttrs(classname, schema, attrs):
 
 def GetUserAttributes(mdb, context, username):
     """Return a dict of (set and unset) attributes on a User."""
-    from bongo.libs import msgapi as MsgApi
+    from libbongo.libs import msgapi as MsgApi
     fields = {}
     userobject = username
     if context:
@@ -448,7 +448,7 @@ def SetupFromXML(mdb, base, xmlfile):
     for obj, attrib in allowedattrs.iteritems():
         if objs[obj] == mdb.C_USER:
             try:
-                from bongo.libs import msgapi as MsgApi
+                from libbongo.libs import msgapi as MsgApi
             except:
                 #TODO: for setup, chop users out of the xml file,
                 #      save it in /tmp somewhere, do the rest of the

src/libs/python/bongo/nmap/NmapClient.py

@@ -1,5 +1,5 @@
 import logging
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 from CommandStream import *
 from NmapConnection import NmapConnection
 from cStringIO import StringIO

src/libs/python/bongo/nmap/NmapConnection.py

@@ -1,6 +1,6 @@
 import socket
 import CommandStream
-import bongo, bongo.libs
+import bongo, libbongo.libs
 
 import logging
 
@@ -14,7 +14,7 @@ def Auth(stream):
     elif r.code == 4242:
         greeting_salt = r.message
 
-        hash = bongo.libs.msgapi.NmapChallenge(greeting_salt)
+        hash = libbongo.libs.msgapi.NmapChallenge(greeting_salt)
         stream.Write("AUTH %s", hash)
 
         r = stream.GetResponse()

src/libs/python/bongo/nmap/QueueClient.py

@@ -1,5 +1,5 @@
 import logging
-import bongo, bongo.libs
+import bongo, libbongo.libs
 from CommandStream import *
 from StoreConnection import StoreConnection
 

src/libs/python/bongo/store/StoreClient.py

@@ -359,7 +359,7 @@ class CalendarACL :
 class StoreClient:
     def __init__(self, user, owner, authToken=None, authCookie=None,
                  authPassword=None):
-        from bongo.libs import msgapi
+        from libbongo.libs import msgapi
         self.owner = self.user = None
         
         addr = msgapi.FindUserNmap(owner)

src/libs/python/bongo/store/StoreConnection.py

@@ -6,7 +6,7 @@ import logging
 
 def Auth(stream):
     """Authenticate against a Store connection on socket s"""
-    from bongo.libs import msgapi
+    from libbongo.libs import msgapi
 
     r = stream.GetResponse()
 

src/libs/python/libbongo/Bongo.rules

@@ -0,0 +1,79 @@
+# -*- Makefile -*-
+pkgpyexecdir = $(pyexecdir)/libbongo
+
+pkgpyexec_PYTHON :=				\
+	src/libs/python/libbongo/__init__.py
+
+pkgpyexec_LTLIBRARIES :=			\
+	libs.la					\
+	bootstrap.la
+
+libs_la_SOURCES :=				\
+	src/libs/python/libbongo/cal.c		\
+	src/libs/python/libbongo/calcmd.c	\
+	src/libs/python/libbongo/libs.c		\
+	src/libs/python/libbongo/libs.h		\
+	src/libs/python/libbongo/mdb.c		\
+	src/libs/python/libbongo/msgapi.c	\
+	src/libs/python/libbongo/msgapi-defs.c	\
+	src/libs/python/libbongo/msgapi-defs.h	\
+	src/libs/python/libbongo/pybongo.c	\
+	src/libs/python/libbongo/pybongo.h	\
+	src/libs/python/libbongo/streamio.c	\
+	src/libs/python/libbongo/json.c		\
+	src/libs/python/libbongo/json.h		\
+	src/libs/python/libbongo/bongoutil.c
+
+libs_la_CPPFLAGS := $(AM_CPPFLAGS)		\
+	$(PYTHON_CPPFLAGS)			\
+	$(bongo_CFLAGS)
+
+libs_la_LDFLAGS := -avoid-version -module
+libs_la_LIBADD :=				\
+	$(PYTHON_LIBS)				\
+	libbongocal.la				\
+	libbongocalcmd.la			\
+	libbongoutil.la				\
+	libbongo-json.la				\
+	libbongomdb.la				\
+	libbongomsgapi.la			\
+	libbongostreamio.la
+
+bootstrap_la_SOURCES :=				\
+	src/libs/python/libbongo/bootstrap.c	\
+	src/libs/python/libbongo/bootstrap.h	\
+	src/libs/python/libbongo/mdb.c		\
+	src/libs/python/libbongo/msgapi-defs.c	\
+	src/libs/python/libbongo/msgapi-defs.h	\
+	src/libs/python/libbongo/pybongo.c	\
+	src/libs/python/libbongo/pybongo.h
+
+bootstrap_la_CPPFLAGS := $(AM_CPPFLAGS)		\
+	$(PYTHON_CPPFLAGS)			\
+	$(bongo_CFLAGS)
+
+bootstrap_la_LDFLAGS := -avoid-version -module
+bootstrap_la_LIBADD :=				\
+	$(PYTHON_LIBS)				\
+	libbongomdb.la				\
+	libbongomsgapi.la
+
+src/libs/python/libbongo/libs.so: libs.la
+	cp .libs/libs.so $@
+
+src/libs/python/libbongo/bootstrap.so: bootstrap.la
+	cp .libs/bootstrap.so $@
+
+noinst_DATA +=					\
+	src/libs/python/libbongo/libs.so	\
+	src/libs/python/libbongo/bootstrap.so	
+
+CLEANFILES +=					\
+	src/libs/python/libbongo/libs.so	\
+	src/libs/python/libbongo/bootstrap.so	
+
+src/libs/python/libbongo/all:			\
+	src/libs/python/libbongo/libs.so	\
+	src/libs/python/libbongo/bootstrap.so	
+
+src/libs/python/bongo/clean: clean

src/libs/python/libbongo/Makefile.am

@@ -0,0 +1,17 @@
+# -*- Makefile -*-
+#
+# Do not edit!
+#
+# (unless this is Makefile.am.subdir)
+#
+# This file is a copy of the toplevel Makefile.am.subdir.  If changes
+# need to be made, edit that file, and make update-makefiles, and
+# check the new files in.
+#
+# This is a skeletal automake file.  The real automake fules for
+# building the targets for this directory can be found in the
+# Bongo.rules file.  This file is simply here so that 'make all' can
+# work in each subdirectory.
+
+all clean install:
+	@cd $(top_builddir) && $(MAKE) $(MFLAGS) $(subdir)/$@

src/www/bongo/dragonfly/Auth.py

@@ -5,8 +5,8 @@ import logging
 import pprint
 import time
 
-from bongo.libs import mdb
-from bongo.libs import msgapi
+from libbongo.libs import mdb
+from libbongo.libs import msgapi
 from bongo.store.StoreClient import StoreClient
 from bongo.store.StoreConnection import StoreConnection
 import bongo

src/www/bongo/dragonfly/CalendarView.py

@@ -1,7 +1,7 @@
 from bongo.dragonfly.ResourceHandler import ResourceHandler, JSONWrapper, Template
 from bongo.store.StoreClient import StoreClient, DocTypes, ACL, CalendarACL, CommandError
 from bongo.CalCmd import Command
-from bongo.libs import cal, calcmd, bongojson, JsonArray, JsonObject, msgapi
+from libbongo.libs import cal, calcmd, bongojson, JsonArray, JsonObject, msgapi
 from bongo.dragonfly.HttpError import HttpError
 
 import datetime

src/www/bongo/dragonfly/MailView.py

@@ -7,7 +7,7 @@ from bongo.store.CommandStream import CommandError
 
 import bongo
 import bongo.dragonfly
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 
 from Composer import StoreComposer, ExistingFilePayload
 

src/www/bongo/dragonfly/PreferencesView.py

@@ -3,7 +3,7 @@ from bongo.store.StoreClient import StoreClient, DocTypes
 from bongo.dragonfly.ResourceHandler import ResourceHandler
 from bongo import BongoError
 from bongo.dragonfly.HttpError import HttpError
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 import bongo.dragonfly
 
 class DragonflyHandler(ResourceHandler):

src/www/bongo/dragonfly/SmsHandler.py

@@ -2,7 +2,7 @@ from ResourceHandler import HttpHandler
 from CalendarView import EventsHandler
 from bongo.store.StoreClient import StoreClient, DocTypes
 from bongo.CalCmd import Command
-from bongo.libs import cal, calcmd
+from libbongo.libs import cal, calcmd
 import bongo.dragonfly
 import urllib
 

src/www/bongo/dragonfly/SummaryView.py

@@ -10,7 +10,7 @@ import bongo.dragonfly
 from email.Utils import parseaddr
 #from datetime import datetime, timedelta, time
 import datetime
-from bongo.libs import cal, calcmd, bongojson, JsonArray, JsonObject, msgapi
+from libbongo.libs import cal, calcmd, bongojson, JsonArray, JsonObject, msgapi
 
 import sys
 

src/www/bongo/hawkeye/RootView.py

@@ -3,7 +3,7 @@ import os
 import bongo.dragonfly.BongoUtil
 from HawkeyeHandler import HawkeyeHandler
 import bongo.hawkeye.Auth as Auth
-from bongo.libs import msgapi
+from libbongo.libs import msgapi
 
 AuthMode = 0