Skip to content

Decorator #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 5, 2015
Merged

Decorator #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70ca4ff
added Connection.__del__ for closing the connection
dimitri-yatsenko May 22, 2015
db71b00
Merge branch 'decorator' of github.com:datajoint/datajoint-python
dimitri-yatsenko Jun 3, 2015
cf10ddb
Merge branch 'decorator' of github.com:datajoint/datajoint-python int…
dimitri-yatsenko Jun 4, 2015
a0eb885
moved the schema management functionality out of the Connection class
dimitri-yatsenko Jun 4, 2015
50df1a3
fixed BaseRelation.is_declared
dimitri-yatsenko Jun 4, 2015
9b70f57
made table_name a class property in the user relation classes
dimitri-yatsenko Jun 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions datajoint/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
__version__ = "0.2"
__all__ = ['__author__', '__version__',
'Connection', 'Heading', 'Relation', 'FreeRelation', 'Not',
'BaseRelation',
'ManualRelation', 'LookupRelation', 'ImportedRelation', 'ComputedRelation',
'AutoPopulate', 'conn', 'DataJointError', 'blob']


Expand All @@ -28,13 +30,11 @@ def resolve(self):
f, args, kwargs = self.operations
return f(*args, **kwargs)


@property
def culprit(self):
return self.operations[0].__name__



# ----------- loads local configuration from file ----------------
from .settings import Config, CONFIGVAR, LOCALCONFIG, logger, log_levels
config = Config()
Expand All @@ -55,9 +55,9 @@ def culprit(self):

# ------------- flatten import hierarchy -------------------------
from .connection import conn, Connection
from .relation import Relation
from .user_relations import ManualRelation, LookupRelation, ImportedRelation, ComputedRelation
from .base_relation import BaseRelation
from .autopopulate import AutoPopulate
from . import blob
from .relational_operand import Not
from .relation import FreeRelation
from .heading import Heading
Loading