← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to base/models.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
base/models.py
101
101
    "Pyramid",
102
102
    "Python10",
103
103
    "Mimas",
 
104
    "StingrayOJ",
 
105
    "Copperhead",
 
106
    "Copperhead12",
 
107
    "Ampere",
 
108
    "Python11",
 
109
    "Saipan",
 
110
    "PyramidPlus",
 
111
    "Hbpl1",
104
112
]
105
113
 
106
114
TECH_CLASSES.sort()
153
161
    "OJ7000"        : 'pcl3',
154
162
    "Python10"      : 'pcl3',
155
163
    "Mimas"      : 'pcl3',
 
164
    "StingrayOJ"   : 'pcl3',
 
165
    "Copperhead"   : 'pcl3',
 
166
    "Copperhead12"   : 'pcl3',
 
167
    "Ampere"       : 'pcl3',
 
168
    "Hbpl1"         : 'hbpl1'
156
169
}
157
170
 
158
171
PDL_TYPE_PCL = 0  # less preferred
176
189
    'jpg' : PDL_TYPE_HOST,
177
190
    'jetready' : PDL_TYPE_HOST,
178
191
    'jr' : PDL_TYPE_HOST,
 
192
    'hbpl1' : PDL_TYPE_HOST,
179
193
}
180
194
 
181
195
 
206
220
    "Trim",
207
221
    "4800x1200dpi",
208
222
    "Advanced",
 
223
    "AutoDuplex"
209
224
]
210
225
 
211
226
TECH_SUBCLASSES.sort()
298
313
            'power-settings': TYPE_INT,
299
314
            'pq-diag-type' : TYPE_INT,
300
315
            'r-type' : TYPE_INT,
301
 
            'scan-style' : TYPE_INT,
302
316
            'scan-type' : TYPE_INT,
303
317
            'scan-src' : TYPE_INT,
304
318
            #'scan-duplex' : TYPE_BOOL,
315
329
            'usb-pid' : TYPE_HEX,
316
330
            'usb-vid' : TYPE_HEX,
317
331
            'wifi-config': TYPE_INT,
 
332
            'ppd-name' : TYPE_STR,
318
333
            }
319
334
 
320
335
        self.FIELD_TYPES_DYN = {