<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14923] CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14923">14923</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-26 13:18:44 -0700 (Fri, 26 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow data in a POST request. PyPy clean-up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsattachpy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/attach.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandspostpy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/post.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsputpy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsattachpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/attach.py (14922 => 14923)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/attach.py 2015-06-26 18:57:39 UTC (rev 14922)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/attach.py 2015-06-26 20:18:44 UTC (rev 14923)
</span><span class="lines">@@ -102,7 +102,8 @@
</span><span class="cx"> if fname:
</span><span class="cx"> fname = os.path.expanduser(fname)
</span><span class="cx"> try:
</span><del>- data = open(fname, "r").read()
</del><ins>+ with open(fname, "r") as f:
+ data = f.read()
</ins><span class="cx"> except IOError:
</span><span class="cx"> print "Unable to read data from file: %s" % (fname,)
</span><span class="cx"> print self.usage(cmdname)
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandspostpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/post.py (14922 => 14923)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/post.py 2015-06-26 18:57:39 UTC (rev 14922)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/post.py 2015-06-26 20:18:44 UTC (rev 14923)
</span><span class="lines">@@ -34,12 +34,15 @@
</span><span class="cx"> fname = None
</span><span class="cx"> content_type = "text/plain"
</span><span class="cx"> path = None
</span><ins>+ data = None
</ins><span class="cx">
</span><del>- opts, args = getopt.getopt(shlex.split(options), 'f:t:')
</del><ins>+ opts, args = getopt.getopt(shlex.split(options), 'd:f:t:')
</ins><span class="cx">
</span><span class="cx"> for name, value in opts:
</span><span class="cx">
</span><del>- if name == "-f":
</del><ins>+ if name == "-d":
+ data = value
+ elif name == "-f":
</ins><span class="cx"> fname = value
</span><span class="cx"> elif name == "-t":
</span><span class="cx"> content_type = value
</span><span class="lines">@@ -48,11 +51,10 @@
</span><span class="cx"> print self.usage(cmdname)
</span><span class="cx"> raise WrongOptions
</span><span class="cx">
</span><del>- if not fname:
- print "File name must be provided"
</del><ins>+ if data and fname:
+ print "Only one of -d or -f is allowed"
</ins><span class="cx"> print self.usage(cmdname)
</span><span class="cx"> raise WrongOptions
</span><del>-
</del><span class="cx"> elif len(args) > 1:
</span><span class="cx"> print "Wrong number of arguments: %d" % (len(args),)
</span><span class="cx"> print self.usage(cmdname)
</span><span class="lines">@@ -67,13 +69,15 @@
</span><span class="cx"> raise WrongOptions
</span><span class="cx">
</span><span class="cx"> # Read in data
</span><del>- fname = os.path.expanduser(fname)
- try:
- data = open(fname, "r").read()
- except IOError:
- print "Unable to read data from file: %s" % (fname,)
- print self.usage(cmdname)
- raise WrongOptions
</del><ins>+ if fname:
+ fname = os.path.expanduser(fname)
+ try:
+ with open(fname, "r") as f:
+ data = f.read()
+ except IOError:
+ print "Unable to read data from file: %s" % (fname,)
+ print self.usage(cmdname)
+ raise WrongOptions
</ins><span class="cx">
</span><span class="cx"> resource = URL(url=path)
</span><span class="cx"> self.shell.account.session.writeData(resource, data, content_type, method="POST")
</span><span class="lines">@@ -86,8 +90,12 @@
</span><span class="cx"> PATH is a relative or absolute path.
</span><span class="cx">
</span><span class="cx"> Options:
</span><del>--f file name of data to put [REQUIRED]
</del><ins>+-f file name of data to put [OPTIONAL]
+-d string containing data to send [OPTIONAL]
</ins><span class="cx"> -t content-type of data being put [DEFAULT: text/plain]
</span><ins>+
+Notes:
+Only one of -f or -d is allowed.
</ins><span class="cx"> """ % (name,)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsputpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py (14922 => 14923)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py 2015-06-26 18:57:39 UTC (rev 14922)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/put.py 2015-06-26 20:18:44 UTC (rev 14923)
</span><span class="lines">@@ -73,7 +73,8 @@
</span><span class="cx"> # Read in data
</span><span class="cx"> fname = os.path.expanduser(fname)
</span><span class="cx"> try:
</span><del>- data = open(fname, "r").read()
</del><ins>+ with open(fname, "r") as f:
+ data = f.read()
</ins><span class="cx"> except IOError:
</span><span class="cx"> print "Unable to read data from file: %s" % (fname,)
</span><span class="cx"> print self.usage(cmdname)
</span></span></pre>
</div>
</div>
</body>
</html>