This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5174

py3: make sure we pass sysstr in sqlite3.connect()
ClosedPublic

Authored by pulkit on Oct 19 2018, 5:26 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3b782669561d: py3: make sure we pass sysstr in sqlite3.connect()
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 19 2018, 5:26 PM
yuja added a subscriber: yuja.Oct 20 2018, 3:19 AM

def makedb(path):

"""Construct a database handle for a database at path."""
  • db = sqlite3.connect(path)

+ db = sqlite3.connect(pycompat.sysstr(path))

Perhaps, encoding.strfromlocal().

pulkit updated this revision to Diff 12293.Oct 21 2018, 11:28 AM
Closed by commit rHG3b782669561d: py3: make sure we pass sysstr in sqlite3.connect() (authored by pulkit). · Explain WhyOct 23 2018, 7:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/sqlitestore.py (3 lines)

Diff 12314

hgext/sqlitestore.py

short, short,
) )
from mercurial.thirdparty import ( from mercurial.thirdparty import (
attr, attr,
) )
from mercurial import ( from mercurial import (
ancestor, ancestor,
dagop, dagop,
encoding,
error, error,
extensions, extensions,
localrepo, localrepo,
mdiff, mdiff,
pycompat, pycompat,
registrar, registrar,
repository, repository,
util, util,
db = makedb(self.svfs.join('db.sqlite')) db = makedb(self.svfs.join('db.sqlite'))
self._db = (tid, db) self._db = (tid, db)
return db return db
def makedb(path): def makedb(path):
"""Construct a database handle for a database at path.""" """Construct a database handle for a database at path."""
db = sqlite3.connect(path) db = sqlite3.connect(encoding.strfromlocal(path))
db.text_factory = bytes db.text_factory = bytes
res = db.execute(r'PRAGMA user_version').fetchone()[0] res = db.execute(r'PRAGMA user_version').fetchone()[0]
# New database. # New database.
if res == 0: if res == 0:
for statement in CREATE_SCHEMA: for statement in CREATE_SCHEMA:
db.execute(statement) db.execute(statement)