projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial port to python3
[htsworkflow.git]
/
htsworkflow
/
frontend
/
experiments
/
models.py
diff --git
a/htsworkflow/frontend/experiments/models.py
b/htsworkflow/frontend/experiments/models.py
index 7a41d3d5902aebe32a56595db04dd859aa6e016d..c29026883f3bf8c59512e42d0c54fd24f0945ec4 100644
(file)
--- a/
htsworkflow/frontend/experiments/models.py
+++ b/
htsworkflow/frontend/experiments/models.py
@@
-20,7
+20,7
@@
LOGGER = logging.getLogger(__name__)
default_pM = 5
try:
default_pM = int(settings.DEFAULT_PM)
default_pM = 5
try:
default_pM = int(settings.DEFAULT_PM)
-except ValueError
,
e:
+except ValueError
as
e:
LOGGER.error("invalid value for frontend.default_pm")
# how many days to wait before trying to re-import a runfolder
LOGGER.error("invalid value for frontend.default_pm")
# how many days to wait before trying to re-import a runfolder
@@
-54,7
+54,7
@@
class ClusterStation(models.Model):
ordering = ["-isdefault", "name"]
def __unicode__(self):
ordering = ["-isdefault", "name"]
def __unicode__(self):
- return
unicode
(self.name)
+ return
str
(self.name)
@classmethod
def default(cls):
@classmethod
def default(cls):
@@
-93,9
+93,9
@@
class Sequencer(models.Model):
ordering = ["-isdefault", "-active", "name"]
def __unicode__(self):
ordering = ["-isdefault", "-active", "name"]
def __unicode__(self):
- name = [
unicode
(self.name)]
+ name = [
str
(self.name)]
if self.instrument_name is not None:
if self.instrument_name is not None:
- name.append("(%s)" % (
unicode
(self.instrument_name),))
+ name.append("(%s)" % (
str
(self.instrument_name),))
return " ".join(name)
@models.permalink
return " ".join(name)
@models.permalink
@@
-150,7
+150,7
@@
class FlowCell(models.Model):
notes = models.TextField(blank=True)
def __unicode__(self):
notes = models.TextField(blank=True)
def __unicode__(self):
- return
unicode
(self.flowcell_id)
+ return
str
(self.flowcell_id)
def Lanes(self):
html = ['<table>']
def Lanes(self):
html = ['<table>']
@@
-184,9
+184,9
@@
class FlowCell(models.Model):
"""Convert our boolean 'is paired' flag to a name
"""
if self.paired_end:
"""Convert our boolean 'is paired' flag to a name
"""
if self.paired_end:
- return
u
"Paired"
+ return "Paired"
else:
else:
- return
u
"Single"
+ return "Single"
@models.permalink
def get_absolute_url(self):
@models.permalink
def get_absolute_url(self):
@@
-304,7
+304,7
@@
class Lane(models.Model):
[str(self.id)])
def __unicode__(self):
[str(self.id)])
def __unicode__(self):
- return self.flowcell.flowcell_id + ':' +
unicode
(self.lane_number)
+ return self.flowcell.flowcell_id + ':' +
str
(self.lane_number)
class DataRun(models.Model):
class DataRun(models.Model):