<!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>[13557] CalendarServer/trunk/txdav/dps/json.py</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/13557">13557</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 11:43:24 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cosmetic</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsjsonpy">CalendarServer/trunk/txdav/dps/json.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/json.py (13556 => 13557)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/json.py 2014-05-29 18:13:38 UTC (rev 13556)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-05-29 18:43:24 UTC (rev 13557)
</span><span class="lines">@@ -21,7 +21,9 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span><ins>+ "expressionAsJSON",
</ins><span class="cx"> "expressionAsJSONText",
</span><ins>+ "expressionFromJSON",
</ins><span class="cx"> "expressionFromJSONText",
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -34,21 +36,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def expressionAsJSONText(expression):
- json = expressionAsJSON(expression)
- return to_json_text(json)
-
-
-
-def expressionAsJSON(expression):
- if isinstance(expression, CompoundExpression):
- return compoundExpressionAsJSON(expression)
-
- if isinstance(expression, MatchExpression):
- return matchExpressionAsJSON(expression)
-
- raise NotImplementedError(
- "Unknown expression type: {!r}".format(expression)
</del><ins>+def matchExpressionAsJSON(expression):
+ return dict(
+ type=expression.__class__.__name__,
+ field=expression.fieldName.name,
+ value=expression.fieldValue,
+ match=expression.matchType.name,
+ flags=expression.flags.name,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -62,41 +56,48 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def matchExpressionAsJSON(expression):
- return dict(
- type=expression.__class__.__name__,
- field=expression.fieldName.name,
- value=expression.fieldValue,
- match=expression.matchType.name,
- flags=expression.flags.name,
</del><ins>+def expressionAsJSON(expression):
+ if isinstance(expression, CompoundExpression):
+ return compoundExpressionAsJSON(expression)
+
+ if isinstance(expression, MatchExpression):
+ return matchExpressionAsJSON(expression)
+
+ raise NotImplementedError(
+ "Unknown expression type: {!r}".format(expression)
</ins><span class="cx"> )
</span><del>- raise NotImplementedError()
</del><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def expressionFromJSONText(jsonText):
- json = from_json_text(jsonText)
- return expressionFromJSON(json)
</del><ins>+def expressionAsJSONText(expression):
+ json = expressionAsJSON(expression)
+ return to_json_text(json)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def expressionFromJSON(json):
- if not isinstance(json, dict):
- raise TypeError("JSON expression must be a dict.")
-
</del><ins>+def matchExpressionFromJSON(json):
</ins><span class="cx"> try:
</span><del>- json_type = json["type"]
</del><ins>+ field_json = json["field"]
+ value_json = json["value"]
+ match_json = json["match"]
+ flags_json = json["flags"]
</ins><span class="cx"> except KeyError as e:
</span><del>- raise ValueError("JSON expression must have {!r} key.".format(e[0]))
</del><ins>+ raise ValueError(
+ "JSON match expression must have {!r} key.".format(e[0])
+ )
</ins><span class="cx">
</span><del>- if json_type == "CompoundExpression":
- return compoundExpressionFromJSON(json)
</del><ins>+ raise NotImplementedError()
</ins><span class="cx">
</span><del>- if json_type == "MatchExpression":
- return matchExpressionFromJSON(json)
</del><ins>+ fieldName = NotImplemented, field_json # Need service...
+ fieldValue = NotImplemented, value_json # Need to cast to correct value
+ matchType = MatchType.lookupByName(match_json)
+ flags = NotImplemented, flags_json # Need to handle composite flags
</ins><span class="cx">
</span><del>- raise NotImplementedError(
- "Unknown expression type: {}".format(json_type)
</del><ins>+ MatchFlags # Shh, flakes
+
+ return MatchExpression(
+ fieldName, fieldValue,
+ matchType=matchType, flags=flags,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -117,33 +118,33 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def matchExpressionFromJSON(json):
</del><ins>+def expressionFromJSON(json):
+ if not isinstance(json, dict):
+ raise TypeError("JSON expression must be a dict.")
+
</ins><span class="cx"> try:
</span><del>- field_json = json["field"]
- value_json = json["value"]
- match_json = json["match"]
- flags_json = json["flags"]
</del><ins>+ json_type = json["type"]
</ins><span class="cx"> except KeyError as e:
</span><del>- raise ValueError(
- "JSON match expression must have {!r} key.".format(e[0])
- )
</del><ins>+ raise ValueError("JSON expression must have {!r} key.".format(e[0]))
</ins><span class="cx">
</span><del>- raise NotImplementedError()
</del><ins>+ if json_type == "CompoundExpression":
+ return compoundExpressionFromJSON(json)
</ins><span class="cx">
</span><del>- fieldName = NotImplemented, field_json # Need service...
- fieldValue = NotImplemented, value_json # Need to cast to correct value
- matchType = MatchType.lookupByName(match_json)
- flags = NotImplemented, flags_json # Need to handle composite flags
</del><ins>+ if json_type == "MatchExpression":
+ return matchExpressionFromJSON(json)
</ins><span class="cx">
</span><del>- MatchFlags # Shh, flakes
-
- return MatchExpression(
- fieldName, fieldValue,
- matchType=matchType, flags=flags,
</del><ins>+ raise NotImplementedError(
+ "Unknown expression type: {}".format(json_type)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def expressionFromJSONText(jsonText):
+ json = from_json_text(jsonText)
+ return expressionFromJSON(json)
+
+
+
</ins><span class="cx"> def to_json_text(obj):
</span><span class="cx"> """
</span><span class="cx"> Convert an object into JSON text.
</span></span></pre>
</div>
</div>
</body>
</html>