[CalendarServer-changes] [7734] CalDAVClientLibrary/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 7 11:59:33 PDT 2011
Revision: 7734
http://trac.macosforge.org/projects/calendarserver/changeset/7734
Author: exarkun at twistedmatrix.com
Date: 2011-07-07 11:59:31 -0700 (Thu, 07 Jul 2011)
Log Message:
-----------
Change the top-level package name from `src` to `caldavclientlibrary`.
Modified Paths:
--------------
CalDAVClientLibrary/trunk/README
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/__init__.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/addrecord.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/changepassword.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/command.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/listrecords.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/removerecord.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/directory.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/record.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/recordtypes.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_directory.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_record.py
CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/utils.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/baseshell.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cat.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cd.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/help.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/history.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/import.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/logging.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/ls.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkadbk.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkcal.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkdir.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mv.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/props.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/proxies.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quit.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quota.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/rm.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/server.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/user.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/whoami.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/shell.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/subshell.py
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/utils.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/account.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/calendar.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/fullclient.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py
CalDAVClientLibrary/trunk/caldavclientlibrary/client/simple.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/headers.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/methods.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/makecalendar.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/multiget.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/makeaddressbook.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/basic.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/gssapi.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/tests/test_basic.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/file.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/string.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/tests/test_url.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/ace.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/acl.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copy.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copymovebase.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/headers.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/methods.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/statuscodes.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/delete.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/get.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/getbase.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/head.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/lock.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/makecollection.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/move.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/multiresponseparser.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/options.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/post.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/principalmatch.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propall.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfind.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindbase.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindparser.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propnames.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/proppatch.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/put.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/report.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/requestresponse.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_ace.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_acl.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_copy.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_delete.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_get.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_head.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_move.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_put.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_report.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_unlock.py
CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/unlock.py
CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py
CalDAVClientLibrary/trunk/caldavclientlibrary/ui/resource.py
CalDAVClientLibrary/trunk/caldavclientlibrary/ui/session.py
CalDAVClientLibrary/trunk/runadmin.py
CalDAVClientLibrary/trunk/runshell.py
CalDAVClientLibrary/trunk/setup.py
Added Paths:
-----------
CalDAVClientLibrary/trunk/caldavclientlibrary/
Removed Paths:
-------------
CalDAVClientLibrary/trunk/src/
Modified: CalDAVClientLibrary/trunk/README
===================================================================
--- CalDAVClientLibrary/trunk/README 2011-07-07 18:42:49 UTC (rev 7733)
+++ CalDAVClientLibrary/trunk/README 2011-07-07 18:59:31 UTC (rev 7734)
@@ -3,7 +3,8 @@
INTRODUCTION
CalDAVCLientLibrary is a Python library and tool for CalDAV. It is
-comprised of four main modules:
+comprised of five main modules in the top-level caldavclientlibrary
+package:
protocol: this implements an HTTP/WebDAV/CalDAV protocol stack, using
httplib to communicate with the server.
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/__init__.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/__init__.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/__init__.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from admin.xmlaccounts.commands.addrecord import AddRecord
-from admin.xmlaccounts.commands.changepassword import ChangePassword
-from admin.xmlaccounts.commands.listrecords import ListRecords
-from admin.xmlaccounts.commands.removerecord import RemoveRecord
+from caldavclientlibrary.admin.xmlaccounts.commands.addrecord import AddRecord
+from caldavclientlibrary.admin.xmlaccounts.commands.changepassword import ChangePassword
+from caldavclientlibrary.admin.xmlaccounts.commands.listrecords import ListRecords
+from caldavclientlibrary.admin.xmlaccounts.commands.removerecord import RemoveRecord
# Commands register themselves in this dict
registered = {}
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/addrecord.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/addrecord.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/addrecord.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from admin.xmlaccounts.commands.command import Command
-from admin.xmlaccounts.record import XMLRecord
+from caldavclientlibrary.admin.xmlaccounts.commands.command import Command
+from caldavclientlibrary.admin.xmlaccounts.record import XMLRecord
from uuid import uuid4
-from admin.xmlaccounts import recordtypes
+from caldavclientlibrary.admin.xmlaccounts import recordtypes
class AddRecord(Command):
"""
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/changepassword.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/changepassword.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/changepassword.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from admin.xmlaccounts.commands.command import Command
+from caldavclientlibrary.admin.xmlaccounts.commands.command import Command
import getopt
class ChangePassword(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/command.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/command.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/command.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from admin.xmlaccounts.directory import XMLDirectory
+from caldavclientlibrary.admin.xmlaccounts.directory import XMLDirectory
from xml.etree.ElementTree import XML
from StringIO import StringIO
-from protocol.utils.xmlhelpers import BetterElementTree
-from admin.xmlaccounts import recordtypes
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.admin.xmlaccounts import recordtypes
from getpass import getpass
import getopt
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/listrecords.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/listrecords.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/listrecords.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from admin.xmlaccounts.commands.command import Command
-from admin.xmlaccounts import recordtypes
+from caldavclientlibrary.admin.xmlaccounts.commands.command import Command
+from caldavclientlibrary.admin.xmlaccounts import recordtypes
import itertools
class ListRecords(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/removerecord.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/commands/removerecord.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/commands/removerecord.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from admin.xmlaccounts.commands.command import Command
+from caldavclientlibrary.admin.xmlaccounts.commands.command import Command
import getopt
class RemoveRecord(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/directory.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/directory.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/directory.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from admin.xmlaccounts import recordtypes
-from admin.xmlaccounts import tags
-from admin.xmlaccounts.record import XMLRecord
+from caldavclientlibrary.admin.xmlaccounts import recordtypes
+from caldavclientlibrary.admin.xmlaccounts import tags
+from caldavclientlibrary.admin.xmlaccounts.record import XMLRecord
from xml.etree.ElementTree import Element
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/manage.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-#import admin.xmlaccounts.commands
-from admin.xmlaccounts.commands import registered
+#import caldavclientlibrary.admin.xmlaccounts.commands
+from caldavclientlibrary.admin.xmlaccounts.commands import registered
import sys
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/record.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/record.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/record.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from admin.xmlaccounts import recordtypes
-from admin.xmlaccounts import tags
+from caldavclientlibrary.admin.xmlaccounts import recordtypes
+from caldavclientlibrary.admin.xmlaccounts import tags
-from protocol.utils.xmlhelpers import SubElementWithData
+from caldavclientlibrary.protocol.utils.xmlhelpers import SubElementWithData
from xml.etree.ElementTree import Element
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/recordtypes.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/recordtypes.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/recordtypes.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -18,7 +18,7 @@
Defines the record type identifiers and various dict's to map between those and XML elements.
"""
-from admin.xmlaccounts import tags
+from caldavclientlibrary.admin.xmlaccounts import tags
recordType_users = "users"
recordType_groups = "groups"
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_directory.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/tests/test_directory.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_directory.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,8 +15,8 @@
##
from StringIO import StringIO
-from admin.xmlaccounts.directory import XMLDirectory
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.admin.xmlaccounts.directory import XMLDirectory
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
from xml.etree.ElementTree import XML
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_record.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/tests/test_record.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/test_record.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,8 +15,8 @@
##
from StringIO import StringIO
-from admin.xmlaccounts.record import XMLRecord
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.admin.xmlaccounts.record import XMLRecord
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
from xml.etree.ElementTree import XML
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/utils.py
===================================================================
--- CalDAVClientLibrary/trunk/src/admin/xmlaccounts/tests/utils.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/tests/utils.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,8 +15,8 @@
##
from StringIO import StringIO
-from admin.xmlaccounts.record import XMLRecord
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.admin.xmlaccounts.record import XMLRecord
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
from xml.etree.ElementTree import XML
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/baseshell.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/baseshell.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/baseshell.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from browser import utils
-from browser.command import CommandError
-from browser.command import UnknownCommand
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.browser import utils
+from caldavclientlibrary.browser.command import CommandError
+from caldavclientlibrary.browser.command import UnknownCommand
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import os
import readline
import traceback
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/acl.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,15 +14,15 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
-from browser.subshell import SubShell
-from browser import commands
-from protocol.webdav.ace import ACE
-from browser import utils
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.browser.subshell import SubShell
+from caldavclientlibrary.browser import commands
+from caldavclientlibrary.protocol.webdav.ace import ACE
+from caldavclientlibrary.browser import utils
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
from xml.etree.ElementTree import QName
import readline
import os
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cat.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/cat.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cat.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cd.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/cd.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/cd.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/help.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/help.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/help.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/history.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/history.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/history.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/import.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/import.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/import.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/logging.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/logging.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/logging.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/ls.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/ls.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/ls.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.caldav.definitions import csxml
-from protocol.webdav.definitions import davxml
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.caldav.definitions import csxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.url import URL
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkadbk.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/mkadbk.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkadbk.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkcal.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/mkcal.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkcal.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkdir.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/mkdir.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mkdir.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mv.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/mv.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/mv.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import readline
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/principal.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
-from browser import utils
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.browser import utils
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/props.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/props.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/props.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
-from browser import utils
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.browser import utils
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/proxies.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/proxies.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/proxies.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,12 +14,12 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
-from browser import utils
-from browser.subshell import SubShell
-from browser import commands
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.browser import utils
+from caldavclientlibrary.browser.subshell import SubShell
+from caldavclientlibrary.browser import commands
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/put.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import os
import getopt
import shlex
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quit.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/quit.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quit.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quota.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/quota.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/quota.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,13 +14,13 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import shlex
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/rm.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/rm.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/rm.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
-from protocol.url import URL
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
import getopt
import os
import readline
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/server.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/server.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/server.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/user.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/user.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/user.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
from getpass import getpass
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/whoami.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/whoami.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/whoami.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.command import WrongOptions
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
class Cmd(Command):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/shell.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/shell.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/shell.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,12 +14,12 @@
# limitations under the License.
##
-from browser.baseshell import BaseShell
-from browser.command import Command
-from client.account import CalDAVAccount
+from caldavclientlibrary.browser.baseshell import BaseShell
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.client.account import CalDAVAccount
from getpass import getpass
-from protocol.url import URL
-import browser.commands
+from caldavclientlibrary.protocol.url import URL
+import caldavclientlibrary.browser.commands
import atexit
import getopt
import sys
@@ -46,9 +46,9 @@
atexit.register(self.saveHistory)
def registerCommands(self):
- module = browser.commands
+ module = caldavclientlibrary.browser.commands
for item in module.__all__:
- mod = __import__("browser.commands." + item, globals(), locals(), ["Cmd",])
+ mod = __import__("caldavclientlibrary.browser.commands." + item, globals(), locals(), ["Cmd",])
cmd_class = mod.Cmd
if type(cmd_class) is type and issubclass(cmd_class, Command):
self.registerCommand(cmd_class())
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/subshell.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/subshell.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/subshell.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from browser.command import Command
-from browser.baseshell import BaseShell
+from caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.baseshell import BaseShell
class SubShell(BaseShell):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/utils.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/utils.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/utils.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import readline
import types
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/account.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/account.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/account.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from client.clientsession import CalDAVSession
-from client.principal import principalCache
+from caldavclientlibrary.client.clientsession import CalDAVSession
+from caldavclientlibrary.client.principal import principalCache
class CalDAVAccount(object):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/calendar.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/calendar.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/calendar.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.definitions import davxml
-from protocol.url import URL
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
class Calendar(object):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/clientsession.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,34 +14,34 @@
# limitations under the License.
##
-from client.httpshandler import SmartHTTPConnection
-from protocol.caldav.definitions import headers
-from protocol.caldav.makecalendar import MakeCalendar
-from protocol.carddav.makeaddressbook import MakeAddressBook
-from protocol.http.authentication.basic import Basic
-from protocol.http.authentication.digest import Digest
+from caldavclientlibrary.client.httpshandler import SmartHTTPConnection
+from caldavclientlibrary.protocol.caldav.definitions import headers
+from caldavclientlibrary.protocol.caldav.makecalendar import MakeCalendar
+from caldavclientlibrary.protocol.carddav.makeaddressbook import MakeAddressBook
+from caldavclientlibrary.protocol.http.authentication.basic import Basic
+from caldavclientlibrary.protocol.http.authentication.digest import Digest
try:
- from protocol.http.authentication.gssapi import Kerberos
+ from caldavclientlibrary.protocol.http.authentication.gssapi import Kerberos
except ImportError:
Kerberos = None
-from protocol.http.data.string import ResponseDataString, RequestDataString
-from protocol.url import URL
-from protocol.webdav.acl import ACL
-from protocol.webdav.definitions import davxml
-from protocol.webdav.definitions import statuscodes
-from protocol.webdav.delete import Delete
-from protocol.webdav.get import Get
-from protocol.webdav.makecollection import MakeCollection
-from protocol.webdav.move import Move
-from protocol.webdav.post import Post
-from protocol.webdav.principalmatch import PrincipalMatch
-from protocol.webdav.propall import PropAll
-from protocol.webdav.propfind import PropFind
-from protocol.webdav.propfindparser import PropFindParser
-from protocol.webdav.propnames import PropNames
-from protocol.webdav.proppatch import PropPatch
-from protocol.webdav.put import Put
-from protocol.webdav.session import Session
+from caldavclientlibrary.protocol.http.data.string import ResponseDataString, RequestDataString
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.acl import ACL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import statuscodes
+from caldavclientlibrary.protocol.webdav.delete import Delete
+from caldavclientlibrary.protocol.webdav.get import Get
+from caldavclientlibrary.protocol.webdav.makecollection import MakeCollection
+from caldavclientlibrary.protocol.webdav.move import Move
+from caldavclientlibrary.protocol.webdav.post import Post
+from caldavclientlibrary.protocol.webdav.principalmatch import PrincipalMatch
+from caldavclientlibrary.protocol.webdav.propall import PropAll
+from caldavclientlibrary.protocol.webdav.propfind import PropFind
+from caldavclientlibrary.protocol.webdav.propfindparser import PropFindParser
+from caldavclientlibrary.protocol.webdav.propnames import PropNames
+from caldavclientlibrary.protocol.webdav.proppatch import PropPatch
+from caldavclientlibrary.protocol.webdav.put import Put
+from caldavclientlibrary.protocol.webdav.session import Session
from xml.etree.ElementTree import Element, tostring
import types
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/fullclient.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/fullclient.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/fullclient.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from client.account import CalDAVAccount
+from caldavclientlibrary.client.account import CalDAVAccount
if __name__ == '__main__':
account = CalDAVAccount("", ssl=True, user="", pswd="", root="", principal="")
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/principal.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from protocol.caldav.definitions import caldavxml
-from client.calendar import Calendar
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
-from protocol.caldav.definitions import headers
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.client.calendar import Calendar
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.caldav.definitions import headers
class PrincipalCache(object):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/simple.py
===================================================================
--- CalDAVClientLibrary/trunk/src/client/simple.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/simple.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from client.httpshandler import SmartHTTPConnection
-from protocol.webdav.session import Session
-from protocol.webdav.options import Options
+from caldavclientlibrary.client.httpshandler import SmartHTTPConnection
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.webdav.options import Options
def run(session, request):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/headers.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/headers.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/headers.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.definitions.headers import * #@UnusedWildImport
+from caldavclientlibrary.protocol.webdav.definitions.headers import * #@UnusedWildImport
# RFC4791
CalendarAccess = "calendar-access"
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/methods.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/methods.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/definitions/methods.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.definitions.methods import * #@UnusedWildImport
+from caldavclientlibrary.protocol.webdav.definitions.methods import * #@UnusedWildImport
# RFC4791 - CalDAV Request Methods
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/makecalendar.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/makecalendar.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/makecalendar.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,15 +14,15 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.caldav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.caldav.definitions import methods
from StringIO import StringIO
-from protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
from xml.etree.ElementTree import Element
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
from xml.etree.ElementTree import SubElement
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class MakeCalendar(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/multiget.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/multiget.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/multiget.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,14 +14,14 @@
# limitations under the License.
##
-from protocol.webdav.report import Report
+from caldavclientlibrary.protocol.webdav.report import Report
from StringIO import StringIO
-from protocol.http.data.string import RequestDataString
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
from xml.etree.ElementTree import Element
from xml.etree.ElementTree import SubElement
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class Multiget(Report):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/tests/test_makecalendar.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.session import Session
-from protocol.caldav.makecalendar import MakeCalendar
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.caldav.makecalendar import MakeCalendar
from StringIO import StringIO
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/tests/test_multiget.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.session import Session
-from protocol.caldav.multiget import Multiget
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.caldav.multiget import Multiget
from StringIO import StringIO
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import unittest
class TestRequest(unittest.TestCase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/makeaddressbook.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/carddav/makeaddressbook.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/makeaddressbook.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,11 +15,11 @@
##
from StringIO import StringIO
-from protocol.carddav.definitions import carddavxml
-from protocol.http.data.string import RequestDataString
-from protocol.utils.xmlhelpers import BetterElementTree
-from protocol.webdav.definitions import davxml, methods
-from protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.carddav.definitions import carddavxml
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml, methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
from xml.etree.ElementTree import Element
from xml.etree.ElementTree import SubElement
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/basic.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/authentication/basic.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/basic.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.authentication.authenticator import Authenticator
-from protocol.http.definitions import headers
+from caldavclientlibrary.protocol.http.authentication.authenticator import Authenticator
+from caldavclientlibrary.protocol.http.definitions import headers
class Basic(Authenticator):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/authentication/digest.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/digest.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.http.authentication.authenticator import Authenticator
-from protocol.http.util import parsetoken
-from protocol.http.definitions import headers
+from caldavclientlibrary.protocol.http.authentication.authenticator import Authenticator
+from caldavclientlibrary.protocol.http.util import parsetoken
+from caldavclientlibrary.protocol.http.definitions import headers
from StringIO import StringIO
import hashlib
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/gssapi.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/authentication/gssapi.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/gssapi.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -22,8 +22,8 @@
see http://limedav.com/hg/urllib2_kerberos
'''
-from protocol.http.authentication.authenticator import Authenticator
-from protocol.http.definitions import headers
+from caldavclientlibrary.protocol.http.authentication.authenticator import Authenticator
+from caldavclientlibrary.protocol.http.definitions import headers
import re
import kerberos
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/tests/test_basic.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/authentication/tests/test_basic.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/authentication/tests/test_basic.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.authentication.basic import Basic
-from protocol.http.definitions import headers
+from caldavclientlibrary.protocol.http.authentication.basic import Basic
+from caldavclientlibrary.protocol.http.definitions import headers
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/file.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/data/file.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/file.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.data.data import ResponseData
-from protocol.http.data.data import RequestData
+from caldavclientlibrary.protocol.http.data.data import ResponseData
+from caldavclientlibrary.protocol.http.data.data import RequestData
import stat
import os
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/string.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/data/string.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/data/string.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.data.data import ResponseData
-from protocol.http.data.data import RequestData
+from caldavclientlibrary.protocol.http.data.data import ResponseData
+from caldavclientlibrary.protocol.http.data.data import RequestData
from StringIO import StringIO
class RequestDataString(RequestData):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/requestresponse.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/requestresponse.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,9 +15,9 @@
##
from StringIO import StringIO
-from protocol.http.definitions import headers
-from protocol.http.definitions import methods
-from protocol.http.definitions import statuscodes
+from caldavclientlibrary.protocol.http.definitions import headers
+from caldavclientlibrary.protocol.http.definitions import methods
+from caldavclientlibrary.protocol.http.definitions import statuscodes
class ResponseError(Exception):
pass
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/tests/test_requestresponse.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from protocol.http.requestresponse import RequestResponse
-from protocol.http.session import Session
-from protocol.http.data.string import RequestDataString
-from protocol.http.authentication.basic import Basic
-from protocol.http.definitions import methods
+from caldavclientlibrary.protocol.http.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.http.authentication.basic import Basic
+from caldavclientlibrary.protocol.http.definitions import methods
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/http/tests/test_util.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.http.util import parsequoted
-from protocol.http.util import parsetoken
-from protocol.http.util import parseStatusLine
+from caldavclientlibrary.protocol.http.util import parsequoted
+from caldavclientlibrary.protocol.http.util import parsetoken
+from caldavclientlibrary.protocol.http.util import parseStatusLine
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/tests/test_url.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/tests/test_url.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/tests/test_url.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.url import URL
+from caldavclientlibrary.protocol.url import URL
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/ace.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/ace.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/ace.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,7 +15,7 @@
##
from xml.etree.ElementTree import QName
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import SubElement
class ACE(object):
@@ -166,4 +166,4 @@
SubElement(ace, davxml.protected)
if self.inherited:
SubElement(ace, davxml.inherited)
-
\ No newline at end of file
+
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/acl.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/acl.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/acl.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,13 +14,13 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
from StringIO import StringIO
-from protocol.http.data.string import RequestDataString
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import Element
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class ACL(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copy.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/copy.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copy.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.copymovebase import CopyMoveBase
+from caldavclientlibrary.protocol.webdav.copymovebase import CopyMoveBase
class Copy(CopyMoveBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copymovebase.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/copymovebase.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/copymovebase.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
class CopyMoveBase(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/headers.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/headers.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/headers.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -16,7 +16,7 @@
# RFC2518 9 - Request Header fields (only the ones we need)
-from protocol.http.definitions.headers import * #@UnusedWildImport
+from caldavclientlibrary.protocol.http.definitions.headers import * #@UnusedWildImport
DAV = "DAV"
DAV1 = "1"
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/methods.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/methods.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/methods.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.http.definitions.methods import * #@UnusedWildImport
+from caldavclientlibrary.protocol.http.definitions.methods import * #@UnusedWildImport
# RFC2518 - WebDAV Request Methods
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/statuscodes.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/statuscodes.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/definitions/statuscodes.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.http.definitions.statuscodes import * #@UnusedWildImport
+from caldavclientlibrary.protocol.http.definitions.statuscodes import * #@UnusedWildImport
Processing = 102
MultiStatus = 207
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/delete.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/delete.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/delete.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
class Delete(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/get.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/get.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/get.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.getbase import GetBase
+from caldavclientlibrary.protocol.webdav.getbase import GetBase
class Get(GetBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/getbase.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/getbase.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/getbase.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
class GetBase(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/head.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/head.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/head.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.getbase import GetBase
+from caldavclientlibrary.protocol.webdav.getbase import GetBase
class Head(GetBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/lock.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/lock.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/lock.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,14 +14,14 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
from StringIO import StringIO
-from protocol.http.data.string import RequestDataString
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import Element
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class Lock(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/makecollection.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/makecollection.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/makecollection.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
class MakeCollection(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/move.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/move.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/move.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,7 +14,7 @@
# limitations under the License.
##
-from protocol.webdav.copymovebase import CopyMoveBase
+from caldavclientlibrary.protocol.webdav.copymovebase import CopyMoveBase
class Move(CopyMoveBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/multiresponseparser.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/multiresponseparser.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/multiresponseparser.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.xmlresponseparser import XMLResponseParser
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.xmlresponseparser import XMLResponseParser
+from caldavclientlibrary.protocol.webdav.definitions import davxml
class MultiResponseParser(XMLResponseParser):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/options.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/options.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/options.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.http.util import parsetoken
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.http.util import parsetoken
+from caldavclientlibrary.protocol.webdav.definitions import headers
class Options(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/post.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/post.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/post.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.definitions import methods
-from protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
class Post(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/principalmatch.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/principalmatch.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/principalmatch.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,15 +14,15 @@
# limitations under the License.
##
-from protocol.webdav.propfindbase import PropFindBase
-from protocol.webdav.definitions import headers
-from protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.propfindbase import PropFindBase
+from caldavclientlibrary.protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.definitions import methods
from StringIO import StringIO
-from protocol.http.data.string import RequestDataString
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import Element
from xml.etree.ElementTree import SubElement
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class PrincipalMatch(PropFindBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propall.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/propall.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propall.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.propfindbase import PropFindBase
+from caldavclientlibrary.protocol.webdav.propfindbase import PropFindBase
from xml.etree.ElementTree import Element
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class PropAll(PropFindBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfind.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/propfind.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfind.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.propfindbase import PropFindBase
+from caldavclientlibrary.protocol.webdav.propfindbase import PropFindBase
from xml.etree.ElementTree import Element
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class PropFind(PropFindBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindbase.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/propfindbase.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindbase.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
-from protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
from StringIO import StringIO
class PropFindBase(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindparser.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/propfindparser.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propfindparser.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from protocol.webdav.multiresponseparser import MultiResponseParser
-from protocol.webdav.definitions import davxml
-from protocol.http.util import parseStatusLine
+from caldavclientlibrary.protocol.webdav.multiresponseparser import MultiResponseParser
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.http.util import parseStatusLine
from xml.etree.ElementTree import QName
-from protocol.url import URL
+from caldavclientlibrary.protocol.url import URL
class PropFindParser(MultiResponseParser):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propnames.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/propnames.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/propnames.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.propfindbase import PropFindBase
+from caldavclientlibrary.protocol.webdav.propfindbase import PropFindBase
from xml.etree.ElementTree import Element
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
class PropNames(PropFindBase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/proppatch.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/proppatch.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/proppatch.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -15,12 +15,12 @@
##
from xml.etree.ElementTree import Element
-from protocol.webdav.definitions import davxml
-from protocol.utils.xmlhelpers import BetterElementTree
-from protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
from xml.etree.ElementTree import SubElement
-from protocol.webdav.definitions import methods
-from protocol.http.data.string import RequestDataString
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.http.data.string import RequestDataString
from StringIO import StringIO
class PropPatch(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/put.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/put.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/put.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
class Put(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/report.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/report.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/report.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
class Report(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/requestresponse.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/requestresponse.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/requestresponse.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.http.requestresponse import RequestResponse as HTTPRequestResponse
-from protocol.http.requestresponse import RequestResponse
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.http.requestresponse import RequestResponse as HTTPRequestResponse
+from caldavclientlibrary.protocol.http.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import headers
class RequestResponse(HTTPRequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/session.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,12 +14,12 @@
# limitations under the License.
##
-from protocol.http.session import Session as HTTPSession
-from protocol.http.requestresponse import RequestResponse
-from protocol.http.data.string import ResponseDataString
-from protocol.http.definitions import methods
-from protocol.http.definitions import statuscodes
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.http.session import Session as HTTPSession
+from caldavclientlibrary.protocol.http.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.http.data.string import ResponseDataString
+from caldavclientlibrary.protocol.http.definitions import methods
+from caldavclientlibrary.protocol.http.definitions import statuscodes
+from caldavclientlibrary.protocol.webdav.definitions import headers
class Session(HTTPSession):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_ace.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_ace.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_ace.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,11 +14,11 @@
# limitations under the License.
##
-from protocol.webdav.ace import ACE
+from caldavclientlibrary.protocol.webdav.ace import ACE
from xml.etree.ElementTree import XML
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import Element
-from protocol.utils.xmlhelpers import BetterElementTree
+from caldavclientlibrary.protocol.utils.xmlhelpers import BetterElementTree
from StringIO import StringIO
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_acl.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_acl.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_acl.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.acl import ACL
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.acl import ACL
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_copy.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_copy.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_copy.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.copy import Copy
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.copy import Copy
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_delete.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_delete.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_delete.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.delete import Delete
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.delete import Delete
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_get.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_get.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_get.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.get import Get
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.get import Get
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_head.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_head.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_head.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.head import Head
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.head import Head
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_lock.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.lock import Lock
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.lock import Lock
+from caldavclientlibrary.protocol.webdav.definitions import headers
from StringIO import StringIO
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_move.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_move.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_move.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.move import Move
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.move import Move
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_options.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_options.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.options import Options
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.options import Options
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_principalmatch.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.session import Session
-from protocol.webdav.principalmatch import PrincipalMatch
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.webdav.principalmatch import PrincipalMatch
from StringIO import StringIO
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import unittest
class TestRequest(unittest.TestCase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_propfind.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,12 +14,12 @@
# limitations under the License.
##
-from protocol.webdav.session import Session
-from protocol.webdav.propfind import PropFind
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.webdav.propfind import PropFind
from StringIO import StringIO
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
from xml.etree.ElementTree import QName
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.definitions import headers
import unittest
class TestRequest(unittest.TestCase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_propfindparser.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfindparser.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.propfindparser import PropFindParser
+from caldavclientlibrary.protocol.webdav.propfindparser import PropFindParser
from xml.etree.ElementTree import XML
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import unittest
class TestRequest(unittest.TestCase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_propnames.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,10 +14,10 @@
# limitations under the License.
##
-from protocol.webdav.session import Session
-from protocol.webdav.propnames import PropNames
+from caldavclientlibrary.protocol.webdav.session import Session
+from caldavclientlibrary.protocol.webdav.propnames import PropNames
from StringIO import StringIO
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.definitions import headers
import unittest
class TestPropNames(unittest.TestCase):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_put.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_put.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_put.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.put import Put
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.put import Put
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_report.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_report.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_report.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.report import Report
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.report import Report
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_unlock.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/tests/test_unlock.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_unlock.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.http.session import Session
-from protocol.webdav.unlock import Unlock
+from caldavclientlibrary.protocol.http.session import Session
+from caldavclientlibrary.protocol.webdav.unlock import Unlock
import unittest
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/unlock.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/unlock.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/unlock.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,9 +14,9 @@
# limitations under the License.
##
-from protocol.webdav.requestresponse import RequestResponse
-from protocol.webdav.definitions import methods
-from protocol.webdav.definitions import headers
+from caldavclientlibrary.protocol.webdav.requestresponse import RequestResponse
+from caldavclientlibrary.protocol.webdav.definitions import methods
+from caldavclientlibrary.protocol.webdav.definitions import headers
class Unlock(RequestResponse):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py
===================================================================
--- CalDAVClientLibrary/trunk/src/ui/WebDAVBrowser.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -44,8 +44,8 @@
import objc
-from protocol.utils import xmlhelpers
-from ui.session import Session
+from caldavclientlibrary.protocol.utils import xmlhelpers
+from caldavclientlibrary.ui.session import Session
from xml.etree.ElementTree import _ElementInterface
import types
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/ui/resource.py
===================================================================
--- CalDAVClientLibrary/trunk/src/ui/resource.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/ui/resource.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
import os
class Resource(object):
Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/ui/session.py
===================================================================
--- CalDAVClientLibrary/trunk/src/ui/session.py 2011-07-07 14:14:55 UTC (rev 7731)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/ui/session.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -14,8 +14,8 @@
# limitations under the License.
##
-from client.account import CalDAVAccount
-from ui.resource import Resource
+from caldavclientlibrary.client.account import CalDAVAccount
+from caldavclientlibrary.ui.resource import Resource
class Session(object):
"""
Modified: CalDAVClientLibrary/trunk/runadmin.py
===================================================================
--- CalDAVClientLibrary/trunk/runadmin.py 2011-07-07 18:42:49 UTC (rev 7733)
+++ CalDAVClientLibrary/trunk/runadmin.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -25,8 +25,7 @@
import os
import sys
- cwd = os.getcwd()
- sys.path.append(os.path.join(cwd, "src"))
+ sys.path.append(os.getcwd())
- from admin.xmlaccounts import manage
+ from caldavclientlibrary.admin.xmlaccounts import manage
manage.runit()
Modified: CalDAVClientLibrary/trunk/runshell.py
===================================================================
--- CalDAVClientLibrary/trunk/runshell.py 2011-07-07 18:42:49 UTC (rev 7733)
+++ CalDAVClientLibrary/trunk/runshell.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -25,8 +25,7 @@
import os
import sys
- cwd = os.getcwd()
- sys.path.append(os.path.join(cwd, "src"))
+ sys.path.append(os.getcwd())
- from src.browser import shell
+ from caldavclientlibrary.browser import shell
shell.runit()
Modified: CalDAVClientLibrary/trunk/setup.py
===================================================================
--- CalDAVClientLibrary/trunk/setup.py 2011-07-07 18:42:49 UTC (rev 7733)
+++ CalDAVClientLibrary/trunk/setup.py 2011-07-07 18:59:31 UTC (rev 7734)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2011 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,19 +20,37 @@
Usage:
python setup.py py2app
"""
+import os
from distutils.core import setup
data_files = []
+package_data = {}
try:
import py2app
except ImportError:
pass
else:
- data_files.append("src/ui/WebDAVBrowser.nib")
+ data_files.append("caldavclientlibrary/ui/WebDAVBrowser.nib")
+ package_data['caldavclientlibrary'] = [
+ 'ui/WebDAVBrowser.nib/*',
+ ]
+packages = []
+for dirpath, dirnames, filenames in os.walk('caldavclientlibrary'):
+ if '__init__.py' in filenames:
+ packages.append(dirpath)
+
plist = dict(NSMainNibFile="WebDAVBrowser")
setup(
- app=["src/ui/WebDAVBrowser.py"],
+ app=["caldavclientlibrary/ui/WebDAVBrowser.py"],
+ packages=packages,
data_files=data_files,
- options=dict(py2app=dict(plist=plist, includes=["urllib", "sha", "md5",], packages=["src/client", "src/protocol", "src/ui",])),
+ package_data=package_data,
+ scripts=['runshell.py', 'runadmin.py'],
+ options=dict(py2app=dict(plist=plist, includes=["urllib", "sha", "md5",],
+ packages=["caldavclientlibrary/client",
+ "caldavclientlibrary/protocol",
+ "caldavclientlibrary/ui",
+ "caldavclientlibrary/admin",
+ ])),
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110707/c0dc819d/attachment-0001.html>
More information about the calendarserver-changes
mailing list