Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
osp
tools.ethertoff
Commits
b43d6228
Commit
b43d6228
authored
Oct 19, 2018
by
svilayphiou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed all __unicode__ into __str__
parent
2911a6c9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
19 deletions
+19
-19
etherpadlite/admin.py
etherpadlite/admin.py
+2
-2
etherpadlite/models.py
etherpadlite/models.py
+5
-5
etherpadlite/tests.py
etherpadlite/tests.py
+4
-4
etherpadlite/views.py
etherpadlite/views.py
+7
-7
ethertoff/templatetags/ethertoff_tags.py
ethertoff/templatetags/ethertoff_tags.py
+1
-1
No files found.
etherpadlite/admin.py
View file @
b43d6228
...
...
@@ -5,11 +5,11 @@ from django.contrib import admin
from
etherpadlite.models
import
*
class
PadAuthorAdmin
(
admin
.
ModelAdmin
):
list_display
=
(
'__
unicode
__'
,)
list_display
=
(
'__
str
__'
,)
class
PadAdmin
(
admin
.
ModelAdmin
):
list_display
=
(
'__
unicode
__'
,)
list_display
=
(
'__
str
__'
,)
readonly_fields
=
(
'name'
,)
exclude
=
(
'display_name'
,)
...
...
etherpadlite/models.py
View file @
b43d6228
...
...
@@ -27,7 +27,7 @@ class PadServer(models.Model):
class
Meta
:
verbose_name
=
_
(
'server'
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
url
@
property
...
...
@@ -48,7 +48,7 @@ class PadGroup(models.Model):
class
Meta
:
verbose_name
=
_
(
'group'
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
group
@
property
...
...
@@ -131,14 +131,14 @@ class PadAuthor(models.Model):
return
full_name
return
self
.
user
.
username
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
full_name_with_prefix
()
def
EtherMap
(
self
):
epclient
=
EtherpadLiteClient
(
self
.
server
.
apikey
,
self
.
server
.
apiurl
)
result
=
epclient
.
createAuthorIfNotExistsFor
(
self
.
user
.
id
.
__str__
(),
name
=
self
.
__
unicode
__
()
name
=
self
.
__
str
__
()
)
self
.
authorID
=
result
[
'authorID'
]
return
result
...
...
@@ -171,7 +171,7 @@ class Pad(models.Model):
server
=
models
.
ForeignKey
(
PadServer
,
models
.
PROTECT
)
group
=
models
.
ForeignKey
(
PadGroup
,
models
.
PROTECT
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
display_slug
def
get_absolute_url
(
self
):
...
...
etherpadlite/tests.py
View file @
b43d6228
...
...
@@ -25,7 +25,7 @@ class PadServerTestCase(unittest.TestCase):
def
testBasics
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
server
,
PadServer
))
self
.
assertEqual
(
self
.
server
.
__
unicode
__
(),
TS
[
'url'
])
self
.
assertEqual
(
self
.
server
.
__
str
__
(),
TS
[
'url'
])
class
PadGroupTestCase
(
unittest
.
TestCase
):
...
...
@@ -46,7 +46,7 @@ class PadGroupTestCase(unittest.TestCase):
def
testBasics
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
padGroup
,
PadGroup
))
self
.
assertEqual
(
self
.
padGroup
.
__
unicode
__
(),
self
.
group
.
__
unicode
__
())
self
.
assertEqual
(
self
.
padGroup
.
__
str
__
(),
self
.
group
.
__
str
__
())
def
tearDown
(
self
):
self
.
padGroup
.
delete
()
...
...
@@ -75,7 +75,7 @@ class PadAuthorTestCase(unittest.TestCase):
def
testBasics
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
author
,
PadAuthor
))
self
.
assertEqual
(
self
.
author
.
__
unicode
__
(),
self
.
user
.
__
unicode
__
())
self
.
assertEqual
(
self
.
author
.
__
str
__
(),
self
.
user
.
__
str
__
())
def
tearDown
(
self
):
self
.
padGroup
.
delete
()
...
...
@@ -109,7 +109,7 @@ class PadTestCase(unittest.TestCase):
def
testBasics
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
pad
,
Pad
))
self
.
assertEqual
(
self
.
pad
.
__
unicode
__
(),
self
.
pad
.
name
)
self
.
assertEqual
(
self
.
pad
.
__
str
__
(),
self
.
pad
.
name
)
def
tearDown
(
self
):
self
.
padGroup
.
delete
()
...
...
etherpadlite/views.py
View file @
b43d6228
...
...
@@ -46,7 +46,7 @@ def padCreate(request, pk):
con
=
{
'form'
:
form
,
'pk'
:
pk
,
'title'
:
_
(
'Create pad in %(grp)s'
)
%
{
'grp'
:
group
.
__
unicode
__
()}
'title'
:
_
(
'Create pad in %(grp)s'
)
%
{
'grp'
:
group
.
__
str
__
()}
}
con
.
update
(
csrf
(
request
))
return
render_to_response
(
...
...
@@ -71,7 +71,7 @@ def padDelete(request, pk):
con
=
{
'action'
:
'/etherpad/delete/'
+
pk
+
'/'
,
'question'
:
_
(
'Really delete this pad?'
),
'title'
:
_
(
'Deleting %(pad)s'
)
%
{
'pad'
:
pad
.
__
unicode
__
()}
'title'
:
_
(
'Deleting %(pad)s'
)
%
{
'pad'
:
pad
.
__
str
__
()}
}
con
.
update
(
csrf
(
request
))
return
render_to_response
(
...
...
@@ -125,7 +125,7 @@ def groupDelete(request, pk):
def
profile
(
request
):
"""Display a user profile containing etherpad groups and associated pads
"""
name
=
request
.
user
.
__
unicode
__
()
name
=
request
.
user
.
__
str
__
()
try
:
# Retrieve the corresponding padauthor object
author
=
PadAuthor
.
objects
.
get
(
user
=
request
.
user
)
...
...
@@ -139,7 +139,7 @@ def profile(request):
groups
=
{}
for
g
in
author
.
group
.
all
():
groups
[
g
.
__
unicode
__
()]
=
{
groups
[
g
.
__
str
__
()]
=
{
'group'
:
g
,
'pads'
:
Pad
.
objects
.
filter
(
group
=
g
)
}
...
...
@@ -174,7 +174,7 @@ def pad(request, pk):
'pad'
:
pad
,
'link'
:
padLink
,
'server'
:
server
,
'uname'
:
author
.
user
.
__
unicode
__
(),
'uname'
:
author
.
user
.
__
str
__
(),
'error'
:
_
(
'You are not allowed to view or edit this pad'
)
},
context_instance
=
RequestContext
(
request
)
...
...
@@ -200,7 +200,7 @@ def pad(request, pk):
'pad'
:
pad
,
'link'
:
padLink
,
'server'
:
server
,
'uname'
:
author
.
user
.
__
unicode
__
(),
'uname'
:
author
.
user
.
__
str
__
(),
'error'
:
_
(
'etherpad-lite session request returned:'
)
+
' "'
+
e
.
reason
+
'"'
},
...
...
@@ -215,7 +215,7 @@ def pad(request, pk):
'pad'
:
pad
,
'link'
:
padLink
,
'server'
:
server
,
'uname'
:
author
.
user
.
__
unicode
__
(),
'uname'
:
author
.
user
.
__
str
__
(),
'error'
:
False
},
context_instance
=
RequestContext
(
request
)
...
...
ethertoff/templatetags/ethertoff_tags.py
View file @
b43d6228
...
...
@@ -50,7 +50,7 @@ def natural_join(val, cjn="and"):
if
isinstance
(
object
,
str
)
or
isinstance
(
object
,
unicode
):
return
object
try
:
return
object
.
__
unicode
__
()
return
object
.
__
str
__
()
except
AttributeError
:
return
repr
(
object
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment