Skip to content
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

Fix circular import bug discovered by @melvinhertz #5

Merged
merged 2 commits into from
Apr 9, 2017
Merged

Fix circular import bug discovered by @melvinhertz #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1219b63
Fix circular import.
rkuykendall Apr 8, 2017
6c34787
Increment version # for release
rkuykendall Apr 9, 2017
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
2 changes: 1 addition & 1 deletion marvelous/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from . import session, exceptions
from .sqlite_cache import SqliteCache
from .sqlite_cache import SqliteCache # NOQA F401 Imported for export


def api(public_key=None, private_key=None, cache=None):
Expand Down
4 changes: 3 additions & 1 deletion marvelous/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from marshmallow import Schema, fields, pre_load, post_load

from . import comics_list, exceptions
from . import exceptions


class Series:
Expand All @@ -12,6 +12,8 @@ def __init__(self, **kwargs):
setattr(self, k, v)

def comics(self, params=None):
from . import comics_list

if params is None:
params = {}

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '1.0.2'
version = '1.0.3'

setup(
author_email='robert@rkuykendall.com',
Expand Down