Revision 18304586
b/snf-astakos-app/astakos/api/quotas.py | ||
---|---|---|
120 | 120 |
@api.api_method(http_method='GET', token_required=True, user_required=False) |
121 | 121 |
@component_from_token |
122 | 122 |
def get_pending_commissions(request): |
123 |
client_key = str(request.component_instance)
|
|
123 |
client_key = unicode(request.component_instance)
|
|
124 | 124 |
|
125 | 125 |
result = qh.get_pending_commissions(clientkey=client_key) |
126 | 126 |
return json_response(result) |
... | ... | |
139 | 139 |
if not is_integer(quantity): |
140 | 140 |
raise ValueError() |
141 | 141 |
except (TypeError, KeyError, ValueError): |
142 |
raise BadRequest("Malformed provision %s" % str(provision))
|
|
142 |
raise BadRequest("Malformed provision %s" % unicode(provision))
|
|
143 | 143 |
return lst |
144 | 144 |
|
145 | 145 |
|
... | ... | |
153 | 153 |
except json.JSONDecodeError: |
154 | 154 |
raise BadRequest("POST data should be in json format.") |
155 | 155 |
|
156 |
client_key = str(request.component_instance)
|
|
156 |
client_key = unicode(request.component_instance)
|
|
157 | 157 |
provisions = input_data.get('provisions') |
158 | 158 |
if provisions is None: |
159 | 159 |
raise BadRequest("Provisions are missing.") |
... | ... | |
243 | 243 |
except json.JSONDecodeError: |
244 | 244 |
raise BadRequest("POST data should be in json format.") |
245 | 245 |
|
246 |
client_key = str(request.component_instance)
|
|
246 |
client_key = unicode(request.component_instance)
|
|
247 | 247 |
accept = input_data.get('accept', []) |
248 | 248 |
reject = input_data.get('reject', []) |
249 | 249 |
|
... | ... | |
273 | 273 |
@component_from_token |
274 | 274 |
def get_commission(request, serial): |
275 | 275 |
data = request.GET |
276 |
client_key = str(request.component_instance)
|
|
276 |
client_key = unicode(request.component_instance)
|
|
277 | 277 |
try: |
278 | 278 |
serial = int(serial) |
279 | 279 |
except ValueError: |
... | ... | |
304 | 304 |
except ValueError: |
305 | 305 |
raise BadRequest("Serial should be an integer.") |
306 | 306 |
|
307 |
client_key = str(request.component_instance)
|
|
307 |
client_key = unicode(request.component_instance)
|
|
308 | 308 |
|
309 | 309 |
accept = 'accept' in input_data |
310 | 310 |
reject = 'reject' in input_data |
b/snf-astakos-app/astakos/im/activation_backends.py | ||
---|---|---|
251 | 251 |
user.moderated_at = datetime.datetime.now() |
252 | 252 |
user.moderated_data = json.dumps(user.__dict__, |
253 | 253 |
default=lambda obj: |
254 |
str(obj))
|
|
254 |
unicode(obj))
|
|
255 | 255 |
user.save() |
256 | 256 |
functions.enable_base_project(user) |
257 | 257 |
|
... | ... | |
323 | 323 |
user.moderated_at = datetime.datetime.now() |
324 | 324 |
user.moderated_data = json.dumps(user.__dict__, |
325 | 325 |
default=lambda obj: |
326 |
str(obj))
|
|
326 |
unicode(obj))
|
|
327 | 327 |
user.is_rejected = True |
328 | 328 |
user.rejected_reason = reason |
329 | 329 |
user.save() |
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
748 | 748 |
main_fields = modifies_main_fields(request) |
749 | 749 |
if main_fields: |
750 | 750 |
m = (_(astakos_messages.BASE_NO_MODIFY_FIELDS) |
751 |
% ", ".join(map(str, main_fields)))
|
|
751 |
% ", ".join(map(unicode, main_fields)))
|
|
752 | 752 |
raise ProjectBadRequest(m) |
753 | 753 |
|
754 | 754 |
new_name = request.get("realname") |
... | ... | |
765 | 765 |
main_fields = modifies_main_fields(request) |
766 | 766 |
if main_fields: |
767 | 767 |
raise ProjectBadRequest("Cannot modify field(s) '%s' in bulk" % |
768 |
", ".join(map(str, main_fields)))
|
|
768 |
", ".join(map(unicode, main_fields)))
|
|
769 | 769 |
|
770 | 770 |
projects = Project.objects.initialized(flt).select_for_update() |
771 | 771 |
_modify_projects(projects, request) |
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
64 | 64 |
import astakos.im.messages as astakos_messages |
65 | 65 |
from synnefo.lib.ordereddict import OrderedDict |
66 | 66 |
|
67 |
from synnefo.util.text import uenc, udec |
|
68 | 67 |
from synnefo.util import units |
69 | 68 |
from astakos.im import presentation |
70 | 69 |
|
... | ... | |
149 | 148 |
msg = 'Token renewed for component %s' |
150 | 149 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, self.name) |
151 | 150 |
|
152 |
def __str__(self):
|
|
151 |
def __unicode__(self):
|
|
153 | 152 |
return self.name |
154 | 153 |
|
155 | 154 |
@classmethod |
... | ... | |
237 | 236 |
ui_visible = models.BooleanField(default=True) |
238 | 237 |
api_visible = models.BooleanField(default=True) |
239 | 238 |
|
240 |
def __str__(self):
|
|
239 |
def __unicode__(self):
|
|
241 | 240 |
return self.name |
242 | 241 |
|
243 | 242 |
def full_name(self): |
244 |
return str(self)
|
|
243 |
return unicode(self)
|
|
245 | 244 |
|
246 | 245 |
def get_info(self): |
247 | 246 |
return {'service': self.service_origin, |
... | ... | |
254 | 253 |
@property |
255 | 254 |
def group(self): |
256 | 255 |
default = self.name |
257 |
return get_presentation(str(self)).get('group', default)
|
|
256 |
return get_presentation(unicode(self)).get('group', default)
|
|
258 | 257 |
|
259 | 258 |
@property |
260 | 259 |
def help_text(self): |
261 | 260 |
default = "%s resource" % self.name |
262 |
return get_presentation(str(self)).get('help_text', default)
|
|
261 |
return get_presentation(unicode(self)).get('help_text', default)
|
|
263 | 262 |
|
264 | 263 |
@property |
265 | 264 |
def help_text_input_each(self): |
266 | 265 |
default = "%s resource" % self.name |
267 |
return get_presentation(str(self)).get('help_text_input_each', default) |
|
266 |
return get_presentation(unicode(self)).get( |
|
267 |
'help_text_input_each', default) |
|
268 | 268 |
|
269 | 269 |
@property |
270 | 270 |
def is_abbreviation(self): |
271 |
return get_presentation(str(self)).get('is_abbreviation', False)
|
|
271 |
return get_presentation(unicode(self)).get('is_abbreviation', False)
|
|
272 | 272 |
|
273 | 273 |
@property |
274 | 274 |
def report_desc(self): |
275 | 275 |
default = "%s resource" % self.name |
276 |
return get_presentation(str(self)).get('report_desc', default)
|
|
276 |
return get_presentation(unicode(self)).get('report_desc', default)
|
|
277 | 277 |
|
278 | 278 |
@property |
279 | 279 |
def placeholder(self): |
280 |
return get_presentation(str(self)).get('placeholder', self.unit)
|
|
280 |
return get_presentation(unicode(self)).get('placeholder', self.unit)
|
|
281 | 281 |
|
282 | 282 |
@property |
283 | 283 |
def verbose_name(self): |
284 |
return get_presentation(str(self)).get('verbose_name', self.name)
|
|
284 |
return get_presentation(unicode(self)).get('verbose_name', self.name)
|
|
285 | 285 |
|
286 | 286 |
@property |
287 | 287 |
def display_name(self): |
... | ... | |
1263 | 1263 |
class Chain(models.Model): |
1264 | 1264 |
chain = models.AutoField(primary_key=True) |
1265 | 1265 |
|
1266 |
def __str__(self):
|
|
1266 |
def __unicode__(self):
|
|
1267 | 1267 |
return "%s" % (self.chain,) |
1268 | 1268 |
|
1269 | 1269 |
|
... | ... | |
1373 | 1373 |
|
1374 | 1374 |
@property |
1375 | 1375 |
def resource_policies(self): |
1376 |
return [str(rp) for rp in self.projectresourcegrant_set.all()]
|
|
1376 |
return [unicode(rp) for rp in self.projectresourcegrant_set.all()]
|
|
1377 | 1377 |
|
1378 | 1378 |
def is_modification(self): |
1379 | 1379 |
# if self.state != self.PENDING: |
... | ... | |
1520 | 1520 |
return sign + unicode(units.show(v, unit)) |
1521 | 1521 |
return map(disp, [proj_abs, member_abs]) |
1522 | 1522 |
|
1523 |
def __str__(self):
|
|
1523 |
def __unicode__(self):
|
|
1524 | 1524 |
return 'Max %s per user: %s' % (self.resource.pluralized_display_name, |
1525 | 1525 |
self.display_member_capacity()) |
1526 | 1526 |
|
... | ... | |
1628 | 1628 |
|
1629 | 1629 |
objects = ProjectManager() |
1630 | 1630 |
|
1631 |
def __str__(self): |
|
1632 |
return uenc(_("<project %s '%s'>") % |
|
1633 |
(self.id, udec(self.realname))) |
|
1634 |
|
|
1635 |
__repr__ = __str__ |
|
1636 |
|
|
1637 | 1631 |
def __unicode__(self): |
1638 | 1632 |
return _("<project %s '%s'>") % (self.id, self.realname) |
1639 | 1633 |
|
... | ... | |
1709 | 1703 |
return self.O_STATE_DISPLAY.get(self.overall_state(), _('Unknown')) |
1710 | 1704 |
|
1711 | 1705 |
def expiration_info(self): |
1712 |
return (str(self.id), self.name, self.state_display(),
|
|
1713 |
str(self.end_date))
|
|
1706 |
return (unicode(self.id), self.name, self.state_display(),
|
|
1707 |
unicode(self.end_date))
|
|
1714 | 1708 |
|
1715 | 1709 |
def last_deactivation(self): |
1716 | 1710 |
objs = self.log.filter(to_state__in=self.DEACTIVATED_STATES) |
... | ... | |
1998 | 1992 |
unique_together = ("person", "project") |
1999 | 1993 |
#index_together = [["project", "state"]] |
2000 | 1994 |
|
2001 |
def __str__(self): |
|
2002 |
return uenc(_("<'%s' membership in '%s'>") % |
|
2003 |
(self.person.username, self.project)) |
|
2004 |
|
|
2005 |
__repr__ = __str__ |
|
1995 |
def __unicode__(self): |
|
1996 |
return (_("<'%s' membership in '%s'>") % |
|
1997 |
(self.person.username, self.project)) |
|
2006 | 1998 |
|
2007 | 1999 |
def latest_log(self): |
2008 | 2000 |
logs = self.log.all() |
b/snf-astakos-app/astakos/quotaholder_app/callpoint.py | ||
---|---|---|
160 | 160 |
try: |
161 | 161 |
th = holdings[key] |
162 | 162 |
except KeyError: |
163 |
m = ("There is no such holding %s" % str(key))
|
|
163 |
m = ("There is no such holding %s" % unicode(key))
|
|
164 | 164 |
provision = _mkProvision(key, quantity) |
165 | 165 |
raise NoHoldingError(m, |
166 | 166 |
provision=provision) |
Also available in: Unified diff