Skip to content

Commit

Permalink
better relative import
Browse files Browse the repository at this point in the history
  • Loading branch information
joamag committed Nov 13, 2014
1 parent 98496fe commit 07220f1
Show file tree
Hide file tree
Showing 19 changed files with 75 additions and 75 deletions.
10 changes: 5 additions & 5 deletions src/appier/api.py
Expand Up @@ -44,11 +44,11 @@
import hashlib
import logging

from appier import base
from appier import http
from appier import legacy
from appier import observer
from appier import exceptions
from . import base
from . import http
from . import legacy
from . import observer
from . import exceptions

class Api(observer.Observable):
"""
Expand Down
34 changes: 17 additions & 17 deletions src/appier/base.py
Expand Up @@ -52,23 +52,23 @@

import logging.handlers

from appier import log
from appier import http
from appier import meta
from appier import util
from appier import smtp
from appier import async
from appier import model
from appier import mongo
from appier import config
from appier import legacy
from appier import request
from appier import defines
from appier import settings
from appier import observer
from appier import controller
from appier import structures
from appier import exceptions
from . import log
from . import http
from . import meta
from . import util
from . import smtp
from . import async
from . import model
from . import mongo
from . import config
from . import legacy
from . import request
from . import defines
from . import settings
from . import observer
from . import controller
from . import structures
from . import exceptions

APP = None
""" The global reference to the application object this
Expand Down
6 changes: 3 additions & 3 deletions src/appier/common.py
Expand Up @@ -38,15 +38,15 @@
""" The license for the module """

def base():
from appier import base
from . import base
return base

def model():
from appier import model
from . import model
return model

def util():
from appier import util
from . import util
return util

def is_devel():
Expand Down
6 changes: 3 additions & 3 deletions src/appier/controller.py
Expand Up @@ -37,9 +37,9 @@
__license__ = "Apache License, Version 2.0"
""" The license for the module """

from appier import meta
from appier import legacy
from appier import observer
from . import meta
from . import legacy
from . import observer

class Controller(legacy.with_meta(meta.Indexed, observer.Observable)):
"""
Expand Down
4 changes: 2 additions & 2 deletions src/appier/exceptions.py
Expand Up @@ -39,8 +39,8 @@

import json

from appier import common
from appier import legacy
from . import common
from . import legacy

class AppierException(Exception):
"""
Expand Down
2 changes: 1 addition & 1 deletion src/appier/export.py
Expand Up @@ -42,7 +42,7 @@
import zipfile
import tempfile

from appier import legacy
from . import legacy

try: import bson
except: bson = None
Expand Down
6 changes: 3 additions & 3 deletions src/appier/http.py
Expand Up @@ -43,9 +43,9 @@
import random
import logging

from appier import legacy
from appier import config
from appier import exceptions
from . import legacy
from . import config
from . import exceptions

TIMEOUT = 60
""" The timeout in seconds to be used for the blocking
Expand Down
4 changes: 2 additions & 2 deletions src/appier/meta.py
Expand Up @@ -37,8 +37,8 @@
__license__ = "Apache License, Version 2.0"
""" The license for the module """

from appier import common
from appier import legacy
from . import common
from . import legacy

class Ordered(type):
"""
Expand Down
18 changes: 9 additions & 9 deletions src/appier/model.py
Expand Up @@ -42,15 +42,15 @@
import logging
import datetime

from appier import meta
from appier import util
from appier import mongo
from appier import legacy
from appier import common
from appier import typesf
from appier import observer
from appier import validation
from appier import exceptions
from . import meta
from . import util
from . import mongo
from . import legacy
from . import common
from . import typesf
from . import observer
from . import validation
from . import exceptions

ITERABLES = list(legacy.STRINGS) + [dict]
""" The sequence defining the complete set of valid types
Expand Down
6 changes: 3 additions & 3 deletions src/appier/mongo.py
Expand Up @@ -39,9 +39,9 @@

import json

from appier import typesf
from appier import config
from appier import common
from . import typesf
from . import config
from . import common

try: import pymongo
except: pymongo = None
Expand Down
2 changes: 1 addition & 1 deletion src/appier/observer.py
Expand Up @@ -37,7 +37,7 @@
__license__ = "Apache License, Version 2.0"
""" The license for the module """

from appier import util
from . import util

class Observable(object):
"""
Expand Down
2 changes: 1 addition & 1 deletion src/appier/part.py
Expand Up @@ -40,7 +40,7 @@
import os
import sys

from appier import util
from . import util

class Part(object):
"""
Expand Down
10 changes: 5 additions & 5 deletions src/appier/request.py
Expand Up @@ -42,11 +42,11 @@
import base64
import datetime

from appier import util
from appier import config
from appier import legacy
from appier import session
from appier import exceptions
from . import util
from . import config
from . import legacy
from . import session
from . import exceptions

CODE_STRINGS = {
100 : "Continue",
Expand Down
8 changes: 4 additions & 4 deletions src/appier/serialize.py
Expand Up @@ -40,10 +40,10 @@
import csv
import uuid

from appier import model
from appier import legacy
from appier import typesf
from appier import exceptions
from . import model
from . import legacy
from . import typesf
from . import exceptions

def serialize(obj):
if isinstance(obj, model.Model): return obj.model
Expand Down
4 changes: 2 additions & 2 deletions src/appier/session.py
Expand Up @@ -44,8 +44,8 @@
import hashlib
import datetime

from appier import config
from appier import legacy
from . import config
from . import legacy

EXPIRE_TIME = datetime.timedelta(days = 31)
""" The default expire time to be used in new sessions
Expand Down
4 changes: 2 additions & 2 deletions src/appier/smtp.py
Expand Up @@ -42,8 +42,8 @@
import email.mime.text
import email.mime.multipart

from appier import config
from appier import legacy
from . import config
from . import legacy

def message(
sender,
Expand Down
6 changes: 3 additions & 3 deletions src/appier/typesf.py
Expand Up @@ -42,9 +42,9 @@
import hashlib
import tempfile

from appier import util
from appier import legacy
from appier import common
from . import util
from . import legacy
from . import common

class Type(object):

Expand Down
8 changes: 4 additions & 4 deletions src/appier/util.py
Expand Up @@ -46,10 +46,10 @@
import inspect
import functools

from appier import legacy
from appier import common
from appier import defines
from appier import exceptions
from . import legacy
from . import common
from . import defines
from . import exceptions

CREATION_COUNTER = 0
""" The global static creation counter value that
Expand Down
10 changes: 5 additions & 5 deletions src/appier/validation.py
Expand Up @@ -41,11 +41,11 @@
import copy
import datetime

from appier import util
from appier import mongo
from appier import common
from appier import legacy
from appier import exceptions
from . import util
from . import mongo
from . import common
from . import legacy
from . import exceptions

SIMPLE_REGEX_VALUE = "^[\:\.\s\w-]+$"
""" The simple regex value used to validate
Expand Down

0 comments on commit 07220f1

Please sign in to comment.