( )⚙ D2566 lfs: use byteskwargs() on some **kwargs for python 3 compat

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2566

lfs: use byteskwargs() on some **kwargs for python 3 compat
ClosedPublic

Authored by durin42 on Mar 2 2018, 5:15 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe30be4d2ac60: lfs: use byteskwargs() on some **kwargs for python 3 compat
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 2 2018, 5:15 PM
indygreg accepted this revision.Mar 2 2018, 5:17 PM
This revision is now accepted and ready to land.Mar 2 2018, 5:17 PM
Closed by commit rHGe30be4d2ac60: lfs: use byteskwargs() on some **kwargs for python 3 compat (authored by durin42). · Explain WhyMar 2 2018, 5:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/pointer.py (4 lines)

Diff 6389

hgext/lfs/pointer.py

# pointer.py - Git-LFS pointer serialization # pointer.py - Git-LFS pointer serialization
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
pycompat,
) )
class InvalidPointer(error.RevlogError): class InvalidPointer(error.RevlogError):
pass pass
class gitlfspointer(dict): class gitlfspointer(dict):
VERSION = 'https://git-lfs.github.com/spec/v1' VERSION = 'https://git-lfs.github.com/spec/v1'
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self['version'] = self.VERSION self['version'] = self.VERSION
super(gitlfspointer, self).__init__(*args, **kwargs) super(gitlfspointer, self).__init__(*args)
self.update(pycompat.byteskwargs(kwargs))
@classmethod @classmethod
def deserialize(cls, text): def deserialize(cls, text):
try: try:
return cls(l.split(' ', 1) for l in text.splitlines()).validate() return cls(l.split(' ', 1) for l in text.splitlines()).validate()
except ValueError: # l.split returns 1 item instead of 2 except ValueError: # l.split returns 1 item instead of 2
raise InvalidPointer(_('cannot parse git-lfs text: %r') % text) raise InvalidPointer(_('cannot parse git-lfs text: %r') % text)