Skip to content
This repository was archived by the owner on Oct 14, 2018. It is now read-only.

Use relative import for settings #9

Open
cbrichford wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use relative import for settings #9

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5f8ff7
Fix unit tests on python 2.6 and 2.7.
cbrichford Jun 30, 2015
ceb86c9
Using relative import for settings.
cbrichford Jul 1, 2015
7663f63
Merge pull request #1 from cbrichford/unittest_fix
cbrichford Jul 1, 2015
db4d415
Merge branch 'master' of github.com:cbrichford/pyzipcode into relativ…
cbrichford Jul 1, 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
4 changes: 2 additions & 2 deletions pyzipcode/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from settings import db_location
from .settings import db_location
try:
import sqlite3
except ImportError:
Expand All @@ -16,7 +16,7 @@ def __init__(self):
conn = sqlite3.connect(db_location)
conn.close()

def query(self, sql, args):
def query(self, sql, args=tuple()):
conn = None
retry_count = 0
while not conn and retry_count <= 10:
Expand Down