Revision: 6483 http://trac.macosforge.org/projects/calendarserver/changeset/6483 Author: wsanchez@apple.com Date: 2010-10-28 17:00:10 -0700 (Thu, 28 Oct 2010) Log Message: ----------- twistedcaldav.__version__ -> calendarserver.__version__ Modified Paths: -------------- CalendarServer/trunk/calendarserver/__init__.py CalendarServer/trunk/calendarserver/tap/caldav.py CalendarServer/trunk/setup.py CalendarServer/trunk/twistedcaldav/__init__.py CalendarServer/trunk/twistedcaldav/extensions.py Property Changed: ---------------- CalendarServer/trunk/calendarserver/ CalendarServer/trunk/twistedcaldav/ Property changes on: CalendarServer/trunk/calendarserver ___________________________________________________________________ Added: svn:ignore + version.py Modified: CalendarServer/trunk/calendarserver/__init__.py =================================================================== --- CalendarServer/trunk/calendarserver/__init__.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/calendarserver/__init__.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -19,7 +19,18 @@ CalendarServer application code. """ +# # setuptools is annoying +# from warnings import filterwarnings filterwarnings("ignore", "Module (.*) was already imported (.*)") del filterwarnings + +# +# Set __version__ +# + +try: + from calendarserver.version import version as __version__ +except ImportError: + __version__ = None Modified: CalendarServer/trunk/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -26,14 +26,12 @@ import stat import sys from time import time - from subprocess import Popen, PIPE from pwd import getpwuid, getpwnam from grp import getgrnam from inspect import getargspec - +import OpenSSL from OpenSSL.SSL import Error as SSLError -import OpenSSL from zope.interface import implements @@ -51,21 +49,20 @@ from twisted.application.service import MultiService, IServiceMaker from twisted.scripts.mktap import getid from twisted.runner import procmon + +import twext from twext.web2.server import Site - from twext.python.log import Logger, LoggingMixIn from twext.python.log import logLevelForNamespace, setLogLevelForNamespace +from twext.python.filepath import CachingFilePath from twext.internet.ssl import ChainingOpenSSLContextFactory from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer - from twext.web2.channel.http import LimitingHTTPFactory, SSLRedirectRequest +from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService -try: - from twistedcaldav.version import version -except ImportError: - sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support")) - from version import version as getVersion - version = "%s (%s)" % getVersion() +from txdav.common.datastore.sql import v1_schema +from txdav.base.datastore.subpostgres import PostgresService +from txdav.common.datastore.util import UpgradeToDatabaseService from twistedcaldav.config import ConfigurationError from twistedcaldav.config import config @@ -76,8 +73,6 @@ from twistedcaldav.stdconfig import DEFAULT_CONFIG, DEFAULT_CONFIG_FILE from twistedcaldav.upgrade import upgradeData -from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService - try: from twistedcaldav.authkerb import NegotiateCredentialFactory NegotiateCredentialFactory # pacify pyflakes @@ -90,10 +85,15 @@ from calendarserver.tap.util import getRootResource, computeProcessCount from calendarserver.tools.util import checkDirectory -from txdav.common.datastore.sql import v1_schema -from txdav.base.datastore.subpostgres import PostgresService -from txdav.common.datastore.util import UpgradeToDatabaseService -from twext.python.filepath import CachingFilePath +try: + from calendarserver.version import version +except ImportError: + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support")) + from version import version as getVersion + version = "%s (%s*)" % getVersion() +twext.web2.server.VERSION = "CalendarServer/%s %s" % ( + version.replace(" ", ""), twext.web2.server.VERSION, +) log = Logger() Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/setup.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -58,7 +58,7 @@ # version_string = "%s (%s)" % version() -version_file = file(os.path.join("twistedcaldav", "version.py"), "w") +version_file = file(os.path.join("calendarserver", "version.py"), "w") version_file.write('version = "%s"\n' % version_string) version_file.close() Property changes on: CalendarServer/trunk/twistedcaldav ___________________________________________________________________ Deleted: svn:ignore - version.py Modified: CalendarServer/trunk/twistedcaldav/__init__.py =================================================================== --- CalendarServer/trunk/twistedcaldav/__init__.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/twistedcaldav/__init__.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -22,15 +22,6 @@ """ # -# Set __version__ -# - -try: - from twistedcaldav.version import version as __version__ -except ImportError: - __version__ = None - -# # Load in suitable file extension/content-type map from OS X # Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -69,17 +69,6 @@ log = Logger() -if twistedcaldav.__version__: - twext.web2.server.VERSION = "CalendarServer/%s %s" % ( - twistedcaldav.__version__.replace(" ", ""), - twext.web2.server.VERSION, - ) -else: - twext.web2.server.VERSION = "CalendarServer/? %s" % ( - twext.web2.server.VERSION, - ) - - class SudoersMixin (object): """ Mixin class to let DAVResource, and DAVFile subclasses know about