Made some pep8 fixes
This commit is contained in:
parent
b414eadff2
commit
e1431dca94
4 changed files with 113 additions and 103 deletions
|
|
@ -5,12 +5,9 @@ from unittest import TestCase
|
|||
from django.test import override_settings
|
||||
from evennia.accounts.accounts import AccountSessionHandler
|
||||
from evennia.accounts.accounts import DefaultAccount
|
||||
from evennia.server.session import Session
|
||||
from evennia.utils import create
|
||||
from evennia.utils.test_resources import EvenniaTest
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
class TestAccountSessionHandler(TestCase):
|
||||
"Check AccountSessionHandler class"
|
||||
|
|
@ -224,4 +221,5 @@ class TestAccountPuppetDeletion(EvenniaTest):
|
|||
# See what happens when we delete char1.
|
||||
self.char1.delete()
|
||||
# Playable char list should be empty.
|
||||
self.assertFalse(self.account.db._playable_characters, 'Playable character list is not empty! %s' % self.account.db._playable_characters)
|
||||
self.assertFalse(self.account.db._playable_characters,
|
||||
'Playable character list is not empty! %s' % self.account.db._playable_characters)
|
||||
|
|
|
|||
|
|
@ -7,15 +7,11 @@ entities.
|
|||
"""
|
||||
import time
|
||||
import inflect
|
||||
import re
|
||||
from builtins import object
|
||||
from future.utils import with_metaclass
|
||||
from collections import defaultdict
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.urls import reverse
|
||||
from django.utils.text import slugify
|
||||
|
||||
from evennia.typeclasses.models import TypeclassBase
|
||||
from evennia.typeclasses.attributes import NickHandler
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
from evennia.utils.test_resources import EvenniaTest
|
||||
|
||||
|
||||
class DefaultObjectTest(EvenniaTest):
|
||||
|
||||
def test_urls(self):
|
||||
|
|
|
|||
|
|
@ -752,7 +752,8 @@ class TypedObject(SharedMemoryModel):
|
|||
|
||||
"""
|
||||
content_type = ContentType.objects.get_for_model(self.__class__)
|
||||
return reverse("admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,))
|
||||
return reverse("admin:%s_%s_change" % (content_type.app_label,
|
||||
content_type.model), args=(self.id,))
|
||||
|
||||
@classmethod
|
||||
def web_get_create_url(cls):
|
||||
|
|
@ -780,8 +781,10 @@ class TypedObject(SharedMemoryModel):
|
|||
path (str): URI path to object creation page, if defined.
|
||||
|
||||
"""
|
||||
try: return reverse('%s-create' % cls._meta.verbose_name.lower())
|
||||
except: return '#'
|
||||
try:
|
||||
return reverse('%s-create' % cls._meta.verbose_name.lower())
|
||||
except:
|
||||
return '#'
|
||||
|
||||
def web_get_detail_url(self):
|
||||
"""
|
||||
|
|
@ -795,7 +798,8 @@ class TypedObject(SharedMemoryModel):
|
|||
a named view of 'character-detail' would be referenced by this method.
|
||||
|
||||
ex.
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$', CharDetailView.as_view(), name='character-detail')
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$',
|
||||
CharDetailView.as_view(), name='character-detail')
|
||||
|
||||
If no View has been created and defined in urls.py, returns an
|
||||
HTML anchor.
|
||||
|
|
@ -808,8 +812,11 @@ class TypedObject(SharedMemoryModel):
|
|||
path (str): URI path to object detail page, if defined.
|
||||
|
||||
"""
|
||||
try: return reverse('%s-detail' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except: return '#'
|
||||
try:
|
||||
return reverse('%s-detail' % self._meta.verbose_name.lower(),
|
||||
kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except:
|
||||
return '#'
|
||||
|
||||
def web_get_update_url(self):
|
||||
"""
|
||||
|
|
@ -823,7 +830,8 @@ class TypedObject(SharedMemoryModel):
|
|||
a named view of 'character-update' would be referenced by this method.
|
||||
|
||||
ex.
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/change/$', CharUpdateView.as_view(), name='character-update')
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/change/$',
|
||||
CharUpdateView.as_view(), name='character-update')
|
||||
|
||||
If no View has been created and defined in urls.py, returns an
|
||||
HTML anchor.
|
||||
|
|
@ -836,8 +844,11 @@ class TypedObject(SharedMemoryModel):
|
|||
path (str): URI path to object update page, if defined.
|
||||
|
||||
"""
|
||||
try: return reverse('%s-update' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except: return '#'
|
||||
try:
|
||||
return reverse('%s-update' % self._meta.verbose_name.lower(),
|
||||
kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except:
|
||||
return '#'
|
||||
|
||||
def web_get_delete_url(self):
|
||||
"""
|
||||
|
|
@ -850,7 +861,8 @@ class TypedObject(SharedMemoryModel):
|
|||
a named view of 'character-detail' would be referenced by this method.
|
||||
|
||||
ex.
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/delete/$', CharDeleteView.as_view(), name='character-delete')
|
||||
url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/delete/$',
|
||||
CharDeleteView.as_view(), name='character-delete')
|
||||
|
||||
If no View has been created and defined in urls.py, returns an
|
||||
HTML anchor.
|
||||
|
|
@ -863,8 +875,11 @@ class TypedObject(SharedMemoryModel):
|
|||
path (str): URI path to object deletion page, if defined.
|
||||
|
||||
"""
|
||||
try: return reverse('%s-delete' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except: return '#'
|
||||
try:
|
||||
return reverse('%s-delete' % self._meta.verbose_name.lower(),
|
||||
kwargs={'pk': self.pk, 'slug': slugify(self.name)})
|
||||
except:
|
||||
return '#'
|
||||
|
||||
# Used by Django Sites/Admin
|
||||
get_absolute_url = web_get_detail_url
|
||||
Loading…
Add table
Add a link
Reference in a new issue