[CalendarServer-changes] [12092] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12092
          http://trac.calendarserver.org//changeset/12092
Author:   wsanchez at apple.com
Date:     2013-12-13 16:25:35 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
"redefinition of unused" error are no longer over-reported by pyflakes.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/sim.py
    CalendarServer/trunk/contrib/performance/stats.py
    CalendarServer/trunk/pyflakes

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2013-12-14 00:19:41 UTC (rev 12091)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2013-12-14 00:25:35 UTC (rev 12092)
@@ -43,6 +43,8 @@
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.protocol import ProcessProtocol
 
+from twisted.web.server import Site
+
 from contrib.performance.loadtest.ical import OS_X_10_6
 from contrib.performance.loadtest.profiles import Eventer, Inviter, Accepter
 from contrib.performance.loadtest.population import (
@@ -214,7 +216,6 @@
 Arrival = namedtuple('Arrival', 'factory parameters')
 
 
-from twisted.web import server
 
 class LoadSimulator(object):
     """
@@ -461,7 +462,7 @@
         if self.runtime is not None:
             self.reactor.callLater(self.runtime, self.stopAndReport)
         if self.webadminPort:
-            self.reactor.listenTCP(self.webadminPort, server.Site(LoadSimAdminResource(self)))
+            self.reactor.listenTCP(self.webadminPort, Site(LoadSimAdminResource(self)))
         self.reactor.run()
 
 

Modified: CalendarServer/trunk/contrib/performance/stats.py
===================================================================
--- CalendarServer/trunk/contrib/performance/stats.py	2013-12-14 00:19:41 UTC (rev 12091)
+++ CalendarServer/trunk/contrib/performance/stats.py	2013-12-14 00:25:35 UTC (rev 12092)
@@ -15,16 +15,19 @@
 ##
 
 from __future__ import print_function
+
 from math import log, sqrt
+from time import mktime
+import random
+import sqlparse
+
 from pycalendar.datetime import DateTime
 from pycalendar.duration import Duration as PyDuration
 from pycalendar.icalendar.property import Property
 from pycalendar.timezone import Timezone
+
+from zope.interface import Interface, implements
 from twisted.python.util import FancyEqMixin
-from zope.interface import Interface, implements
-import random
-import time
-import sqlparse
 
 
 NANO = 1000000000.0
@@ -394,7 +397,7 @@
 
 
     def astimestamp(self, dt):
-        return time.mktime(dt.timetuple())
+        return mktime(dt.timetuple())
 
 
     def _findWorkAfter(self, when):

Modified: CalendarServer/trunk/pyflakes
===================================================================
--- CalendarServer/trunk/pyflakes	2013-12-14 00:19:41 UTC (rev 12091)
+++ CalendarServer/trunk/pyflakes	2013-12-14 00:25:35 UTC (rev 12092)
@@ -21,7 +21,6 @@
 
 cd "${wd}" && "${pyflakes}" "$@" | sed                                    \
   -e "/'from ctypes import \\*' used; unable to detect undefined names/d" \
-  -e "/redefinition of unused/d"                                          \
   -e "/xmlext.py:[0-9][0-9]*: /d"                                         \
   | tee "${tmp}";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/3ffedf4d/attachment.html>