Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 06:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made some pep8 fixes

Browse source
This commit is contained in:
Griatch 2018-10-22 23:32:12 +02:00
parent cfc8179740
commit 30547cb5bf
4 changed files with 113 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/objects/objects.py
View file

@ -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
@ -218,7 +214,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
@property
def is_connected(self):
# we get an error for objects subscribed to channels without this
if self.account: # seems sane to pass on the account
if self.account: # seems sane to pass on the account
return self.account.is_connected
else:
return False
@ -328,7 +324,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# look at 'an egg'.
self.aliases.add(singular, category="plural_key")
return singular, plural
def search(self, searchdata,
global_search=False,
use_nicks=True,
@ -922,7 +918,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
self.account.db._playable_characters = [x for x in self.account.db._playable_characters if x != self]
for session in self.sessions.all():
self.account.unpuppet_object(session)
self.account = None
for script in _ScriptDB.objects.get_all_scripts_on_obj(self):