Changeset ffbe41d for server/lib/gutenbach/server

Timestamp:

Jan 10, 2012, 7:25:33 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

b01b6d1

Parents:

ce2abc5

git-author:

Jessica B. Hamrick <jhamrick@…> (01/10/12 19:25:33)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/10/12 19:25:33)

Message:

Clean up core ipp code a bit

Location:

server/lib/gutenbach/server

Files:

• printer.py (modified) (3 diffs)
• requests.py (modified) (1 diff)
• server.py (modified) (1 diff)

server/lib/gutenbach/server/printer.py

@@ -1 @@
-#import alsaaudio as aa
 from . import InvalidJobException, InvalidPrinterStateException
 from . import Job
@@ -45 +44 @@
         
 
-    #def __init__(self, name, card, mixer):
     def __init__(self, name):
 
@@ -52 +50 @@
         self.time_created = int(time.time())
         self.state = "idle"
-
-        # if card >= len(aa.cards()):
-        #     raise aa.ALSAAudioError(
-        #       "Audio card at index %d does not exist!" % card)
-        # elif mixer not in aa.mixers(card):
-        #     raise aa.ALSAAudioError(
-        #       "Audio mixer '%s' does not exist!" % mixer)
-        
-        # self.card = card
-        # self.mixer = mixer
 
         self.finished_jobs = []

server/lib/gutenbach/server/requests.py

@@ -281 +281 @@
         """
 
-
         operation = request.attribute_groups[0]
 

server/lib/gutenbach/server/server.py

@@ -79 +79 @@
                 chunk = self.rfile.read(size)
                 clrf = self.rfile.read(2)
-                assert clrf == "\r\n"
+                if clrf != "\r\n":
+                    raise ipp.errors.ServerErrorInternalError(
+                        "clrf != \\r\\n (is '%s')" % clrf)
                 tmp.write(chunk)