Skip to content

Commit 323214c

Browse files
committed
no relative imports
1 parent ab65ba2 commit 323214c

26 files changed

+166
-175
lines changed

data_browser/admin.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from django.contrib import admin
22
from django.utils.html import format_html
33

4-
from . import models
5-
from .common import PUBLIC_PERM
6-
from .common import has_permission
7-
from .common import set_global_state
8-
from .helpers import AdminMixin
9-
from .helpers import attributes
4+
from data_browser import models
5+
from data_browser.common import PUBLIC_PERM
6+
from data_browser.common import has_permission
7+
from data_browser.common import set_global_state
8+
from data_browser.helpers import AdminMixin
9+
from data_browser.helpers import attributes
1010

1111

1212
@admin.register(models.View)

data_browser/api.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
from django.shortcuts import get_object_or_404
55
from django.views.decorators import csrf
66

7-
from .common import SHARE_PERM
8-
from .common import HttpResponse
9-
from .common import JsonResponse
10-
from .common import global_state
11-
from .common import set_global_state
12-
from .common import str_user
13-
from .common import users_with_permission
14-
from .models import View
15-
from .util import group_by
7+
from data_browser.common import SHARE_PERM
8+
from data_browser.common import HttpResponse
9+
from data_browser.common import JsonResponse
10+
from data_browser.common import global_state
11+
from data_browser.common import set_global_state
12+
from data_browser.common import str_user
13+
from data_browser.common import users_with_permission
14+
from data_browser.models import View
15+
from data_browser.util import group_by
1616

1717

1818
def clean_str(field, value):

data_browser/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from django.contrib.contenttypes.models import ContentType
1212
from django.utils.functional import cached_property
1313

14-
from . import version
14+
from data_browser import version
1515

1616

1717
class Settings:
@@ -51,7 +51,7 @@ def has_permission(user, permission):
5151

5252

5353
def users_with_permission(permission):
54-
from .models import View
54+
from data_browser.models import View
5555

5656
ct = ContentType.objects.get_for_model(View)
5757
perm = Permission.objects.get(codename=permission, content_type=ct)
@@ -185,7 +185,7 @@ def __init__(
185185

186186
@cached_property
187187
def models(self):
188-
from .orm_admin import get_models
188+
from data_browser.orm_admin import get_models
189189

190190
old = global_state._state
191191
global_state._state = None

data_browser/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from django.db.models import BooleanField
88
from django.urls import reverse
99

10-
from .common import settings
10+
from data_browser.common import settings
1111

1212

1313
def attributes(**kwargs):

data_browser/migration_helpers.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
from django.test import RequestFactory
66
from django.urls import reverse
77

8+
from data_browser.common import global_state
9+
from data_browser.common import set_global_state
810
from data_browser.types import IsNullType
911
from data_browser.types import NumberChoiceArrayType
1012
from data_browser.types import NumberChoiceType
1113
from data_browser.types import StringChoiceArrayType
1214
from data_browser.types import StringChoiceType
1315

14-
from .common import global_state
15-
from .common import set_global_state
16-
1716

1817
def _fix_filter(models, field, parts, lookup, value):
1918
if lookup == "is_null":

data_browser/models.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from django.utils import crypto
55
from django.utils import timezone
66

7-
from .common import PUBLIC_PERM
8-
from .common import SHARE_PERM
9-
from .common import global_state
10-
from .common import has_permission
11-
from .common import set_global_state
12-
from .common import settings
7+
from data_browser.common import PUBLIC_PERM
8+
from data_browser.common import SHARE_PERM
9+
from data_browser.common import global_state
10+
from data_browser.common import has_permission
11+
from data_browser.common import set_global_state
12+
from data_browser.common import settings
1313

1414

1515
def get_id():
@@ -43,7 +43,7 @@ class Meta:
4343
limit = models.IntegerField(blank=False, null=False, default=1000)
4444

4545
def get_query(self):
46-
from .query import Query
46+
from data_browser.query import Query
4747

4848
params = list(hyperlink.parse(f"?{self.query}").query)
4949
params.append(("limit", str(self.limit)))

data_browser/orm_admin.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@
1818
from django.urls import reverse
1919
from django.utils.html import format_html
2020

21-
from .common import JsonResponse
22-
from .common import debug_log
23-
from .common import global_state
24-
from .common import settings
25-
from .helpers import AdminMixin
26-
from .helpers import _AnnotationDescriptor
27-
from .helpers import _get_option
28-
from .helpers import attributes
29-
from .orm_aggregates import get_aggregates_for_type
30-
from .orm_debug import DebugQS
31-
from .orm_fields import OrmAnnotatedField
32-
from .orm_fields import OrmCalculatedField
33-
from .orm_fields import OrmConcreteField
34-
from .orm_fields import OrmFileField
35-
from .orm_fields import OrmFkField
36-
from .orm_fields import OrmRawField
37-
from .orm_functions import get_functions_for_type
38-
from .orm_types import get_field_type
39-
from .types import TYPES
40-
from .types import BooleanType
41-
from .types import JSONType
42-
from .types import NumberType
43-
from .types import StringType
44-
from .util import str_to_field
45-
from .util import title_case
21+
from data_browser.common import JsonResponse
22+
from data_browser.common import debug_log
23+
from data_browser.common import global_state
24+
from data_browser.common import settings
25+
from data_browser.helpers import AdminMixin
26+
from data_browser.helpers import _AnnotationDescriptor
27+
from data_browser.helpers import _get_option
28+
from data_browser.helpers import attributes
29+
from data_browser.orm_aggregates import get_aggregates_for_type
30+
from data_browser.orm_debug import DebugQS
31+
from data_browser.orm_fields import OrmAnnotatedField
32+
from data_browser.orm_fields import OrmCalculatedField
33+
from data_browser.orm_fields import OrmConcreteField
34+
from data_browser.orm_fields import OrmFileField
35+
from data_browser.orm_fields import OrmFkField
36+
from data_browser.orm_fields import OrmRawField
37+
from data_browser.orm_functions import get_functions_for_type
38+
from data_browser.orm_types import get_field_type
39+
from data_browser.types import TYPES
40+
from data_browser.types import BooleanType
41+
from data_browser.types import JSONType
42+
from data_browser.types import NumberType
43+
from data_browser.types import StringType
44+
from data_browser.util import str_to_field
45+
from data_browser.util import title_case
4646

4747

4848
@dataclass

data_browser/orm_aggregates.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
from django.db.models import Value
88
from django.db.models.functions import Cast
99

10-
from .orm_fields import OrmBaseField
11-
from .orm_fields import OrmBoundField
12-
from .types import ARRAY_TYPES
13-
from .types import TYPES
14-
from .types import BaseType
15-
from .types import BooleanType
16-
from .types import DateTimeType
17-
from .types import DateType
18-
from .types import DurationType
19-
from .types import NumberType
20-
from .util import annotation_path
10+
from data_browser.orm_fields import OrmBaseField
11+
from data_browser.orm_fields import OrmBoundField
12+
from data_browser.types import ARRAY_TYPES
13+
from data_browser.types import TYPES
14+
from data_browser.types import BaseType
15+
from data_browser.types import BooleanType
16+
from data_browser.types import DateTimeType
17+
from data_browser.types import DateType
18+
from data_browser.types import DurationType
19+
from data_browser.types import NumberType
20+
from data_browser.util import annotation_path
2121

2222
try:
2323
from django.contrib.postgres.aggregates import ArrayAgg

data_browser/orm_fields.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
from django.db.models import OuterRef
77
from django.db.models import Subquery
88

9-
from .common import global_state
10-
from .orm_debug import DebugQS
11-
from .types import ASC
12-
from .types import BaseType
13-
from .types import BooleanType
14-
from .types import DateTimeType
15-
from .types import DateType
16-
from .types import HTMLType
17-
from .types import UnknownType
18-
from .types import URLType
19-
from .util import annotation_path
9+
from data_browser.common import global_state
10+
from data_browser.orm_debug import DebugQS
11+
from data_browser.types import ASC
12+
from data_browser.types import BaseType
13+
from data_browser.types import BooleanType
14+
from data_browser.types import DateTimeType
15+
from data_browser.types import DateType
16+
from data_browser.types import HTMLType
17+
from data_browser.types import UnknownType
18+
from data_browser.types import URLType
19+
from data_browser.util import annotation_path
2020

2121

2222
@dataclass
@@ -212,7 +212,7 @@ def format(obj):
212212

213213
class OrmBoundAnnotatedField(OrmBoundField):
214214
def _annotate(self, qs, debug=False):
215-
from .orm_admin import admin_get_queryset
215+
from data_browser.orm_admin import admin_get_queryset
216216

217217
if debug:
218218
subquery = DebugQS("Subquery")

data_browser/orm_functions.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
from django.db.models import Q
99
from django.db.models import functions
1010

11-
from .orm_fields import OrmBaseField
12-
from .orm_fields import OrmBoundField
13-
from .types import ARRAY_TYPES
14-
from .types import ASC
15-
from .types import TYPES
16-
from .types import BaseType
17-
from .types import DateTimeType
18-
from .types import DateType
19-
from .types import IsNullType
20-
from .types import NumberChoiceType
21-
from .types import NumberType
22-
from .types import StringType
23-
from .util import annotation_path
11+
from data_browser.orm_fields import OrmBaseField
12+
from data_browser.orm_fields import OrmBoundField
13+
from data_browser.types import ARRAY_TYPES
14+
from data_browser.types import ASC
15+
from data_browser.types import TYPES
16+
from data_browser.types import BaseType
17+
from data_browser.types import DateTimeType
18+
from data_browser.types import DateType
19+
from data_browser.types import IsNullType
20+
from data_browser.types import NumberChoiceType
21+
from data_browser.types import NumberType
22+
from data_browser.types import StringType
23+
from data_browser.util import annotation_path
2424

2525
try:
2626
from django.contrib.postgres.fields.array import ArrayLenTransform

0 commit comments

Comments
 (0)