[CalendarServer-changes] [8663] CalendarServer/branches/users/glyph/table-alias

[source_changes at macosforge.org]

Revision: 8663
          http://trac.macosforge.org/projects/calendarserver/changeset/8663
Author:   glyph at apple.com
Date:     2012-02-13 10:04:01 -0800 (Mon, 13 Feb 2012)
Log Message:
-----------
small cleanup, reorder so `__doc__` is `__doc__`

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/table-alias/txdav/common/datastore/test/util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/table-alias/

Modified: CalendarServer/branches/users/glyph/table-alias/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/branches/users/glyph/table-alias/txdav/common/datastore/test/util.py	2012-02-13 18:03:57 UTC (rev 8662)
+++ CalendarServer/branches/users/glyph/table-alias/txdav/common/datastore/test/util.py	2012-02-13 18:04:01 UTC (rev 8663)
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-from twistedcaldav.config import config
-
 """
 Store test utility functions
 """
@@ -37,6 +35,8 @@
 from twisted.python import log
 from twisted.application.service import Service
 
+from twistedcaldav.config import config
+
 from txdav.common.datastore.sql import CommonDataStore, current_sql_schema
 from txdav.base.datastore.subpostgres import PostgresService
 from txdav.base.datastore.dbapiclient import DiagnosticConnectionWrapper
@@ -349,6 +349,9 @@
             # explicitly listed.
             try:
                 yield home.removeCalendarWithName("calendar")
+                # FIXME: this should be an argument to the function, not a
+                # global configuration variable.  Related: this needs
+                # independent tests.
                 if config.RestrictCalendarsToOneComponentType:
                     yield home.removeCalendarWithName("tasks")
                 yield home.removeCalendarWithName("inbox")
@@ -370,6 +373,8 @@
                         )
     yield populateTxn.commit()
 
+
+
 @inlineCallbacks
 def resetCalendarMD5s(md5s, store):
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120213/8704b2a1/attachment-0001.html>