Format code imports
This commit is contained in:
parent
92834aacd0
commit
a461a97576
361 changed files with 1019 additions and 754 deletions
|
|
@ -4,9 +4,10 @@ The custom manager for Scripts.
|
|||
|
||||
from django.conf import settings
|
||||
from django.db.models import Q
|
||||
from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
|
||||
from evennia.utils.utils import make_iter, class_from_module, dbid_to_obj
|
||||
|
||||
from evennia.server import signals
|
||||
from evennia.typeclasses.managers import TypeclassManager, TypedObjectManager
|
||||
from evennia.utils.utils import class_from_module, dbid_to_obj, make_iter
|
||||
|
||||
__all__ = ("ScriptManager", "ScriptDBManager")
|
||||
_GA = object.__getattribute__
|
||||
|
|
@ -258,8 +259,8 @@ class ScriptDBManager(TypedObjectManager):
|
|||
"""
|
||||
global _ObjectDB, _AccountDB
|
||||
if not _ObjectDB:
|
||||
from evennia.objects.models import ObjectDB as _ObjectDB
|
||||
from evennia.accounts.models import AccountDB as _AccountDB
|
||||
from evennia.objects.models import ObjectDB as _ObjectDB
|
||||
|
||||
typeclass = typeclass if typeclass else settings.BASE_SCRIPT_TYPECLASS
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def convert_defaults(apps, schema_editor):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def remove_manage_scripts(apps, schema_editor):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def remove_manage_scripts(apps, schema_editor):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Generated by Django 1.11.2 on 2017-07-05 17:27
|
||||
|
||||
|
||||
from django.db import migrations, models, connection
|
||||
import django.db.models.deletion
|
||||
from django.db import connection, migrations, models
|
||||
|
||||
|
||||
def _table_exists(db_cursor, tablename):
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Generated by Django 1.11.2 on 2017-07-06 20:41
|
||||
|
||||
|
||||
from django.db import migrations, connection
|
||||
from django.db import connection, migrations
|
||||
|
||||
|
||||
def _table_exists(db_cursor, tablename):
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.16 on 2019-01-28 18:20
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@ Common examples of uses of Scripts:
|
|||
|
||||
"""
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from evennia.typeclasses.models import TypedObject
|
||||
from django.db import models
|
||||
|
||||
from evennia.scripts.manager import ScriptDBManager
|
||||
from evennia.typeclasses.models import TypedObject
|
||||
from evennia.utils.utils import dbref, to_str
|
||||
|
||||
__all__ = ("ScriptDB",)
|
||||
|
|
|
|||
|
|
@ -11,12 +11,11 @@ functionality:
|
|||
|
||||
"""
|
||||
import inspect
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
from evennia.server.models import ServerConfig
|
||||
from evennia.utils import logger, variable_from_module
|
||||
from evennia.utils.dbserialize import dbserialize, dbunserialize
|
||||
from evennia.utils import logger
|
||||
from evennia.utils import variable_from_module
|
||||
|
||||
_SA = object.__setattr__
|
||||
_GA = object.__getattribute__
|
||||
|
|
|
|||
|
|
@ -5,12 +5,11 @@ added to all game objects. You access it through the property
|
|||
`scripts` on the game object.
|
||||
|
||||
"""
|
||||
from evennia.scripts.models import ScriptDB
|
||||
from evennia.utils import create
|
||||
from evennia.utils import logger
|
||||
|
||||
from django.utils.translation import gettext as _
|
||||
|
||||
from evennia.scripts.models import ScriptDB
|
||||
from evennia.utils import create, logger
|
||||
|
||||
|
||||
class ScriptHandler(object):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -6,12 +6,13 @@ ability to run timers.
|
|||
"""
|
||||
|
||||
from django.utils.translation import gettext as _
|
||||
from twisted.internet.defer import Deferred, maybeDeferred
|
||||
from twisted.internet.task import LoopingCall
|
||||
|
||||
from evennia.scripts.manager import ScriptManager
|
||||
from evennia.scripts.models import ScriptDB
|
||||
from evennia.typeclasses.models import TypeclassBase
|
||||
from evennia.utils import create, logger
|
||||
from twisted.internet.defer import Deferred, maybeDeferred
|
||||
from twisted.internet.task import LoopingCall
|
||||
|
||||
__all__ = ["DefaultScript", "DoNothing", "Store"]
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,15 @@ Module containing the task handler for Evennia deferred tasks, persistent or not
|
|||
"""
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from pickle import PickleError
|
||||
|
||||
from twisted.internet import reactor
|
||||
from pickle import PickleError
|
||||
from twisted.internet.task import deferLater
|
||||
from twisted.internet.defer import CancelledError as DefCancelledError
|
||||
from twisted.internet.task import deferLater
|
||||
|
||||
from evennia.server.models import ServerConfig
|
||||
from evennia.utils.logger import log_err
|
||||
from evennia.utils.dbserialize import dbserialize, dbunserialize
|
||||
from evennia.utils.logger import log_err
|
||||
|
||||
TASK_HANDLER = None
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
from unittest import TestCase, mock
|
||||
|
||||
from parameterized import parameterized
|
||||
|
||||
from evennia import DefaultScript
|
||||
from evennia.scripts.models import ScriptDB, ObjectDoesNotExist
|
||||
from evennia.scripts.models import ObjectDoesNotExist, ScriptDB
|
||||
from evennia.scripts.scripts import DoNothing, ExtendedLoopingCall
|
||||
from evennia.utils.create import create_script
|
||||
from evennia.utils.test_resources import BaseEvenniaTest
|
||||
from evennia.scripts.scripts import DoNothing, ExtendedLoopingCall
|
||||
|
||||
|
||||
class TestScript(BaseEvenniaTest):
|
||||
|
|
|
|||
|
|
@ -67,13 +67,14 @@ call the handler's `save()` and `restore()` methods when the server reboots.
|
|||
"""
|
||||
import inspect
|
||||
|
||||
from twisted.internet.defer import inlineCallbacks
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from twisted.internet.defer import inlineCallbacks
|
||||
|
||||
from evennia.scripts.scripts import ExtendedLoopingCall
|
||||
from evennia.server.models import ServerConfig
|
||||
from evennia.utils.logger import log_trace, log_err
|
||||
from evennia.utils import inherits_from, variable_from_module
|
||||
from evennia.utils.dbserialize import dbserialize, dbunserialize, pack_dbobj
|
||||
from evennia.utils import variable_from_module, inherits_from
|
||||
from evennia.utils.logger import log_err, log_trace
|
||||
|
||||
_GA = object.__getattribute__
|
||||
_SA = object.__setattr__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue