[CalendarServer-changes] [10715] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 10715
          http://trac.calendarserver.org//changeset/10715
Author:   wsanchez at apple.com
Date:     2013-02-13 13:59:31 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/push/amppush.py
    CalendarServer/trunk/pyflakes
    CalendarServer/trunk/twext/web2/test/test_http_headers.py
    CalendarServer/trunk/twistedcaldav/test/test_notify.py

Modified: CalendarServer/trunk/calendarserver/push/amppush.py
===================================================================
--- CalendarServer/trunk/calendarserver/push/amppush.py	2013-02-13 21:07:41 UTC (rev 10714)
+++ CalendarServer/trunk/calendarserver/push/amppush.py	2013-02-13 21:59:31 UTC (rev 10715)
@@ -16,7 +16,6 @@
 
 from calendarserver.push.util import PushScheduler
 from twext.python.log import Logger, LoggingMixIn
-from twext.python.log import LoggingMixIn
 from twisted.application.internet import StreamServerEndpointService
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.endpoints import TCP4ClientEndpoint, TCP4ServerEndpoint

Modified: CalendarServer/trunk/pyflakes
===================================================================
--- CalendarServer/trunk/pyflakes	2013-02-13 21:07:41 UTC (rev 10714)
+++ CalendarServer/trunk/pyflakes	2013-02-13 21:59:31 UTC (rev 10715)
@@ -14,12 +14,11 @@
 
 tmp="$(mktemp "/tmp/pyflakes.XXXXX")";
 
-cd "${wd}" && "${flakes}/bin/pyflakes" "$@" | sed                     \
-  -e "/redefinition of unused/d"                                      \
-  -e "/'from .* import \\*' used; unable to detect undefined names/d" \
-  -e "/redefinition of function/d"                                    \
-  -e "/xmlext.py:[0-9][0-9]*: /d"                                     \
-  -e "/^twext\\/backport/d"                                           \
+cd "${wd}" && "${flakes}/bin/pyflakes" "$@" | sed                         \
+  -e "/'from ctypes import \\*' used; unable to detect undefined names/d" \
+  -e "/redefinition of unused/d"                                          \
+  -e "/^twext\\/backport/d"                                               \
+  -e "/xmlext.py:[0-9][0-9]*: /d"                                         \
   | tee "${tmp}";
 
 if [ -s "${tmp}" ]; then error="true"; else error="false"; fi;

Modified: CalendarServer/trunk/twext/web2/test/test_http_headers.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_http_headers.py	2013-02-13 21:07:41 UTC (rev 10714)
+++ CalendarServer/trunk/twext/web2/test/test_http_headers.py	2013-02-13 21:59:31 UTC (rev 10715)
@@ -799,10 +799,10 @@
 
     def testRoundtrip(self):
         for _ignore in range(2000):
-            time = random.randint(0, 2000000000)
-            timestr = http_headers.generateDateTime(time)
+            randomTime = random.randint(0, 2000000000)
+            timestr = http_headers.generateDateTime(randomTime)
             time2 = http_headers.parseDateTime(timestr)
-            self.assertEquals(time, time2)
+            self.assertEquals(randomTime, time2)
 
 
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_notify.py	2013-02-13 21:07:41 UTC (rev 10714)
+++ CalendarServer/trunk/twistedcaldav/test/test_notify.py	2013-02-13 21:59:31 UTC (rev 10715)
@@ -17,7 +17,13 @@
 from twisted.internet.task import Clock
 from twisted.words.protocols.jabber.client import IQ
 from twisted.words.protocols.jabber.error import StanzaError
-from twistedcaldav.notify import *
+from twistedcaldav.notify import Notifier, NotifierFactory
+from twistedcaldav.notify import NotificationClientFactory, Coalescer
+from twistedcaldav.notify import SimpleLineNotifier, SimpleLineNotificationFactory
+from twistedcaldav.notify import SimpleLineNotificationProtocol
+from twistedcaldav.notify import XMPPNotifier, XMPPNotificationFactory
+from twistedcaldav.notify import getPubSubConfiguration, getPubSubAPSConfiguration
+from twistedcaldav.notify import getXMPPSettings
 from twistedcaldav.config import Config
 from twistedcaldav.stdconfig import DEFAULT_CONFIG, PListConfigProvider
 from twistedcaldav.test.util import TestCase
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130213/bc12f09d/attachment-0001.html>