Changeset f70792f for server/lib/gutenbach/server/requests.py

Timestamp:

Jan 21, 2012, 5:11:09 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

279640c

Parents:

4914b47 (diff), 374c558 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Daniel Cooper <danny@…> (01/21/12 17:11:09)

git-committer:

Daniel Cooper <danny@…> (01/21/12 17:11:09)

Message:

Merge branch 'no-cups' of github.com:jhamrick/gutenbach into no-cups

File:

• server/lib/gutenbach/server/requests.py (modified) (3 diffs)

server/lib/gutenbach/server/requests.py

@@ -985 +985 @@
             REQUIRED 'job-id' (integer(1:MAX)) and 'printer-uri' (uri)
             REQUIRED 'document-uri' (uri)
-              -or-   'job-uri' (uri)
+            OPTIONAL 'job-uri' (uri)
             OPTIONAL 'requesting-user-name' (name(MAX))
             OPTIONAL 'document-name' (name(MAX))
@@ -991 +991 @@
             OPTIONAL 'document-format' (mimeMediaType)
             OPTIONAL 'document-natural-language' (naturalLanguage)
-        Group 2: Document Content
             
         Response
@@ -1069 +1068 @@
             self.printer.send_uri(
                 job_id,
-                document_uri=document_uri,
+                document_uri,
                 document_name=document_name,
                 document_format=document_format,