[CalendarServer-changes] [5160] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Feb 20 07:41:23 PST 2010
Revision: 5160
http://trac.macosforge.org/projects/calendarserver/changeset/5160
Author: wsanchez at apple.com
Date: 2010-02-20 07:41:23 -0800 (Sat, 20 Feb 2010)
Log Message:
-----------
pyflakes
Modified Paths:
--------------
CalendarServer/trunk/pyflakes
CalendarServer/trunk/twext/web2/dav/davxml.py
CalendarServer/trunk/twext/web2/dav/element/base.py
CalendarServer/trunk/twext/web2/dav/fileop.py
CalendarServer/trunk/twext/web2/dav/method/copymove.py
CalendarServer/trunk/twext/web2/dav/method/put.py
CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py
CalendarServer/trunk/twext/web2/dav/resource.py
CalendarServer/trunk/twext/web2/dav/static.py
CalendarServer/trunk/twext/web2/dav/test/test_http.py
CalendarServer/trunk/twext/web2/dav/test/test_prop.py
CalendarServer/trunk/twext/web2/dav/test/test_xattrprops.py
CalendarServer/trunk/twext/web2/dav/test/util.py
CalendarServer/trunk/twext/web2/dirlist.py
CalendarServer/trunk/twext/web2/filter/gzip.py
CalendarServer/trunk/twext/web2/http_headers.py
CalendarServer/trunk/twext/web2/server.py
CalendarServer/trunk/twext/web2/stream.py
CalendarServer/trunk/twext/web2/test/test_compat.py
CalendarServer/trunk/twext/web2/test/test_http.py
CalendarServer/trunk/twext/web2/test/test_http_headers.py
CalendarServer/trunk/twext/web2/test/test_stream.py
Modified: CalendarServer/trunk/pyflakes
===================================================================
--- CalendarServer/trunk/pyflakes 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/pyflakes 2010-02-20 15:41:23 UTC (rev 5160)
@@ -19,4 +19,5 @@
-e "/'from .* import \\*' used; unable to detect undefined names/d" \
-e "/redefinition of function/d" \
-e "/i[a-z]*store.py:[0-9][0-9]*: '.*' imported but unused/d" \
+ -e "/xmlext.py:[0-9][0-9]*: /d" \
;
Modified: CalendarServer/trunk/twext/web2/dav/davxml.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/davxml.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/davxml.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -47,7 +47,7 @@
from twext.web2.dav.element.rfc3253 import *
from twext.web2.dav.element.rfc3744 import *
from twext.web2.dav.element.rfc4331 import *
-from twext.web2.dav.element.extensions import CurrentUserPrincipal
+from twext.web2.dav.element.extensions import *
#
# Register all XML elements with the parser
@@ -84,7 +84,6 @@
from twext.web2.dav._errorbase import ErrorResponse as SuperErrorResponse
from twext.web2.dav.davxml import dav_namespace, twisted_dav_namespace, WebDAVElement, WebDAVTextElement
from twext.web2.dav.davxml import WebDAVUnknownElement, Error
-from twext.web2.http_headers import MimeType
def sname2qname(sname):
Modified: CalendarServer/trunk/twext/web2/dav/element/base.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/element/base.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/element/base.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -47,13 +47,12 @@
import string
import cStringIO as StringIO
-import xml.dom.minidom
import datetime
from twisted.python import log
from twext.web2.http_headers import parseDateTime
-from twext.web2.dav.element.util import PrintXML, decodeXMLName
+from twext.web2.dav.element.util import decodeXMLName
##
# Base XML elements
Modified: CalendarServer/trunk/twext/web2/dav/fileop.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/fileop.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/fileop.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -111,7 +111,6 @@
# NOTE: len(uri_path) is wrong if os.sep is not one byte long... meh.
request_basename = filepath.path[:-len(uri_path)]
- request_basename_len = len(request_basename)
errors = ResponseQueue(request_basename, "DELETE", responsecode.NO_CONTENT)
Modified: CalendarServer/trunk/twext/web2/dav/method/copymove.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/copymove.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/method/copymove.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -29,8 +29,6 @@
__all__ = ["http_COPY", "http_MOVE"]
-import urlparse
-
from twisted.python import log
from twisted.internet.defer import waitForDeferred, deferredGenerator
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twext/web2/dav/method/put.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/put.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/method/put.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -61,7 +61,6 @@
responsecode.FORBIDDEN,
"The requested resource exists but is not backed by a regular file."
))
- resource_is_new = False
else:
if not self.fp.parent().isdir():
log.err("No such directory: %s" % (self.fp.path,))
@@ -69,7 +68,6 @@
responsecode.CONFLICT,
"Parent collection resource does not exist."
))
- resource_is_new = True
#
# HTTP/1.1 (RFC 2068, section 9.6) requires that we respond with a Not
Modified: CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -34,7 +34,6 @@
from twext.web2 import responsecode
from twext.web2.http import HTTPError, StatusResponse
from twext.web2.dav import davxml
-from twext.web2.dav.davxml import dav_namespace
from twext.web2.dav.http import ErrorResponse
from twext.web2.dav.http import MultiStatusResponse
from twext.web2.dav.method import prop_common
Modified: CalendarServer/trunk/twext/web2/dav/resource.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/resource.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/resource.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -56,7 +56,7 @@
from twisted.cred.error import LoginFailed, UnauthorizedLogin
from twisted.python import log
from twisted.python.failure import Failure
-from twisted.internet.defer import Deferred, maybeDeferred, succeed, inlineCallbacks
+from twisted.internet.defer import Deferred, maybeDeferred, succeed
from twisted.internet.defer import waitForDeferred, deferredGenerator
from twisted.internet import reactor
from twext.web2 import responsecode
Modified: CalendarServer/trunk/twext/web2/dav/static.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/static.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/static.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -32,12 +32,11 @@
from twisted.python.filepath import InsecurePath
from twisted.python import log
from twext.web2 import http_headers
-from twext.web2 import responsecode, dirlist
-from twext.web2.dav import davxml
+from twext.web2 import responsecode
from twext.web2.dav.resource import DAVResource, davPrivilegeSet
from twext.web2.dav.resource import TwistedGETContentMD5
from twext.web2.dav.util import bindMethods
-from twext.web2.http import HTTPError, StatusResponse, RedirectResponse
+from twext.web2.http import HTTPError, StatusResponse
from twext.web2.static import File
try:
Modified: CalendarServer/trunk/twext/web2/dav/test/test_http.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_http.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/test/test_http.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -77,7 +77,7 @@
def _check_exception(self, exception, result):
try:
raise exception
- except Exception, e:
+ except Exception:
failure = Failure()
status = statusForFailure(failure)
self.failUnless(
Modified: CalendarServer/trunk/twext/web2/dav/test/test_prop.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_prop.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/test/test_prop.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -21,18 +21,13 @@
#
# DRI: Wilfredo Sanchez, wsanchez at apple.com
##
-from twext.web2.dav.element.rfc4331 import QuotaUsedBytes
-from twext.web2.dav.element.rfc4331 import QuotaAvailableBytes
-
import random
-from twisted.trial.unittest import SkipTest
from twext.web2 import responsecode
from twext.web2.iweb import IResponse
from twext.web2.stream import MemoryStream
from twext.web2 import http_headers
from twext.web2.dav import davxml
-from twext.web2.dav.resource import DAVResource
from twext.web2.dav.davxml import dav_namespace, lookupElement
from twext.web2.dav.util import davXMLFromStream
from twext.web2.test.test_server import SimpleRequest
@@ -46,12 +41,6 @@
)
-#
-# See whether dead properties are available
-#
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.static import DeadPropertyStore
-
class PROP(twext.web2.dav.test.util.TestCase):
"""
PROPFIND, PROPPATCH requests
Modified: CalendarServer/trunk/twext/web2/dav/test/test_xattrprops.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/test_xattrprops.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/test/test_xattrprops.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -300,7 +300,7 @@
self.addCleanup(self.resourcePath.parent().chmod, 0700)
# Try to get a property from it - and fail.
- document = self._makeValue()
+ self._makeValue()
error = self.assertRaises(HTTPError, self.propertyStore.list)
# Make sure that the status is FORBIDDEN, a roughly reasonable mapping
Modified: CalendarServer/trunk/twext/web2/dav/test/util.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/test/util.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dav/test/util.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -27,7 +27,6 @@
from filecmp import dircmp as DirCompare
from tempfile import mkdtemp
from shutil import copy
-from random import randrange, choice
from twisted.python import log
from twisted.trial import unittest
Modified: CalendarServer/trunk/twext/web2/dirlist.py
===================================================================
--- CalendarServer/trunk/twext/web2/dirlist.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/dirlist.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -31,7 +31,7 @@
import time
# twisted imports
-from twext.web2 import iweb, resource, http, http_headers
+from twext.web2 import resource, http, http_headers
def formatFileSize(size):
if size < 1024:
Modified: CalendarServer/trunk/twext/web2/filter/gzip.py
===================================================================
--- CalendarServer/trunk/twext/web2/filter/gzip.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/filter/gzip.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -65,7 +65,6 @@
response.headers.setHeader('vary', vary+['accept-encoding'])
ae = request.headers.getHeader('accept-encoding', {})
- compressor = None
# Always prefer gzip over deflate no matter what their q-values are.
if ae.get('gzip', 0):
response.stream = gzipStream(response.stream)
Modified: CalendarServer/trunk/twext/web2/http_headers.py
===================================================================
--- CalendarServer/trunk/twext/web2/http_headers.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/http_headers.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -100,8 +100,7 @@
header = p(header)
# if isinstance(h, types.GeneratorType):
# h=list(h)
- except ValueError,v:
- # print v
+ except ValueError:
header=None
return header
@@ -270,7 +269,6 @@
ctls=http_ctls
string = ",".join(header)
- list = []
start = 0
cur = 0
quoted = False
Modified: CalendarServer/trunk/twext/web2/server.py
===================================================================
--- CalendarServer/trunk/twext/web2/server.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/server.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -45,7 +45,6 @@
from twext.web2 import http_headers
from twext.web2.filter.range import rangefilter
from twext.web2 import error
-from twext.web2.dav.util import joinURL
from twext.web2 import __version__ as web2_version
from twisted import __version__ as twisted_version
@@ -105,7 +104,6 @@
if request.stream.length == 0:
return defer.succeed(None)
- parser = None
ctype = request.headers.getHeader('content-type')
if ctype is None:
@@ -246,7 +244,7 @@
if port is None: port = self.port
if path is None: path = self.path
if params is None: params = self.params
- if querystring is None: query = self.querystring
+ if querystring is None: querystring = self.querystring
if fragment is None: fragment = ''
if port == http.defaultPortForScheme.get(scheme, 0):
@@ -332,7 +330,7 @@
self._fixupURLParts()
self.remoteAddr = self.chanRequest.getRemoteHost()
except:
- failedDeferred = self._processingFailed(failure.Failure())
+ self._processingFailed(failure.Failure())
return
d = defer.Deferred()
Modified: CalendarServer/trunk/twext/web2/stream.py
===================================================================
--- CalendarServer/trunk/twext/web2/stream.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/stream.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -216,15 +216,15 @@
self.f = None
return None
- if sendfile and length > SENDFILE_THRESHOLD:
- # XXX: Yay using non-existent sendfile support!
- # FIXME: if we return a SendfileBuffer, and then sendfile
- # fails, then what? Or, what if file is too short?
- readSize = min(length, SENDFILE_LIMIT)
- res = SendfileBuffer(self.f, self.start, readSize)
- self.length -= readSize
- self.start += readSize
- return res
+ #if sendfile and length > SENDFILE_THRESHOLD:
+ # # XXX: Yay using non-existent sendfile support!
+ # # FIXME: if we return a SendfileBuffer, and then sendfile
+ # # fails, then what? Or, what if file is too short?
+ # readSize = min(length, SENDFILE_LIMIT)
+ # res = SendfileBuffer(self.f, self.start, readSize)
+ # self.length -= readSize
+ # self.start += readSize
+ # return res
if self.useMMap and length > MMAP_THRESHOLD:
readSize = min(length, MMAP_LIMIT)
Modified: CalendarServer/trunk/twext/web2/test/test_compat.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_compat.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/test/test_compat.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -1,5 +1,4 @@
from twext.web2.test.test_server import BaseCase
-import sys
try:
from twisted.web import resource
@@ -22,6 +21,7 @@
import twisted.web
except ImportError:
skip = "can't run w/o twisted.web"
+ twisted.web
def testOldWebResource(self):
ow = OldWebResource('I am an OldWebResource')
Modified: CalendarServer/trunk/twext/web2/test/test_http.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_http.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/test/test_http.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -6,7 +6,7 @@
from zope.interface import implements
from twisted.trial import unittest
-from twext.web2 import http, http_headers, responsecode, error, iweb, stream
+from twext.web2 import http, http_headers, responsecode, iweb, stream
from twext.web2 import channel
from twisted.internet import reactor, protocol, address, interfaces, utils
@@ -738,9 +738,6 @@
def testTimeout_inRequest(self):
cxn = self.connect(inputTimeOut = 0.3)
- cmds = [[]]
- data = ""
-
cxn.client.write("GET / HTTP/1.1\r\n")
return deferLater(reactor, 0.5, self.assertDone, cxn)
Modified: CalendarServer/trunk/twext/web2/test/test_http_headers.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_http_headers.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/test/test_http_headers.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -432,6 +432,7 @@
http_headers.ETag('c3piozzzz')]),
('*', ['*']),
)
+ self.runRoundtripTest("If-Match", table)
def testIfModifiedSince(self):
# Don't need major tests since the datetime parser has its own test
# Just test stupid ; length= brokenness.
Modified: CalendarServer/trunk/twext/web2/test/test_stream.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_stream.py 2010-02-20 14:38:28 UTC (rev 5159)
+++ CalendarServer/trunk/twext/web2/test/test_stream.py 2010-02-20 15:41:23 UTC (rev 5160)
@@ -9,8 +9,8 @@
from zope.interface import implements
-# sibpath is *not* unused - the doctests use it.
from twisted.python.util import sibpath
+sibpath # sibpath is *not* unused - the doctests use it.
from twisted.internet import reactor, defer, interfaces
from twisted.trial import unittest
from twext.web2 import stream
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100220/2d0aeb8c/attachment-0001.html>
More information about the calendarserver-changes
mailing list