Skip to content

Commit eba81c7

Browse files
committed
Fix duplicate Resource initialization in View subclasses.
--HG-- extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%40115
1 parent 425431b commit eba81c7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

couchdb/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ class PermanentView(View):
595595

596596
def __init__(self, uri, name, wrapper=None, http=None):
597597
View.__init__(self, uri, wrapper=wrapper, http=http)
598-
self.resource = Resource(http, uri)
599598
self.name = name
600599

601600
def __repr__(self):
@@ -612,7 +611,6 @@ class TemporaryView(View):
612611
def __init__(self, uri, map_fun=None, reduce_fun=None,
613612
language='javascript', wrapper=None, http=None):
614613
View.__init__(self, uri, wrapper=wrapper, http=http)
615-
self.resource = Resource(http, uri)
616614
self.map_fun = map_fun
617615
self.reduce_fun = reduce_fun
618616
self.language = language
@@ -870,11 +868,13 @@ def uri(base, *path, **query):
870868

871869
return ''.join(retval)
872870

871+
873872
def unicode_quote(string, safe=''):
874873
if isinstance(string, unicode):
875874
string = string.encode('utf-8')
876875
return quote(string, safe)
877876

877+
878878
def unicode_urlencode(data):
879879
if isinstance(data, dict):
880880
data = data.items()
@@ -885,6 +885,7 @@ def unicode_urlencode(data):
885885
params.append((name, value))
886886
return urlencode(params)
887887

888+
888889
VALID_DB_NAME = re.compile(r'^[a-z0-9_$()+-/]+$')
889890
def validate_dbname(name):
890891
if not VALID_DB_NAME.match(name):

couchdb/tools/dump.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from couchdb import __version__ as VERSION
2121
from couchdb.client import Database
2222

23+
2324
def dump_db(dburl, username=None, password=None, boundary=None):
2425
envelope = MIMEMultipart('mixed', boundary)
2526
db = Database(dburl)
@@ -53,6 +54,7 @@ def dump_db(dburl, username=None, password=None, boundary=None):
5354
envelope.attach(part)
5455
return envelope.as_string()
5556

57+
5658
def main():
5759
parser = OptionParser(usage='%prog [options] dburl', version=VERSION)
5860
parser.add_option('-u', '--username', action='store', dest='username',
@@ -68,5 +70,6 @@ def main():
6870
print dump_db(args[0], username=options.username,
6971
password=options.password)
7072

73+
7174
if __name__ == '__main__':
7275
main()

0 commit comments

Comments
 (0)