Skip to content

Commit 2325efb

Browse files
authored
Merge branch 'main' into speed_up_notation_parse
2 parents 1bb6812 + f590a0b commit 2325efb

File tree

2 files changed

+29
-26
lines changed

2 files changed

+29
-26
lines changed

.github/workflows/cla.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Check CLA
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
pull_request_target:
7+
types: [opened, closed, synchronize]
8+
9+
jobs:
10+
cla:
11+
name: Check CLA
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: CLA Assistant
15+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
16+
uses: secondlife-3p/contributor-assistant@v2
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
PERSONAL_ACCESS_TOKEN: ${{ secrets.SHARED_CLA_TOKEN }}
20+
with:
21+
branch: main
22+
path-to-document: https://github.com/secondlife/cla/blob/master/CLA.md
23+
path-to-signatures: signatures.json
24+
remote-organization-name: secondlife
25+
remote-repository-name: cla-signatures

llsd/__init__.py

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,9 @@
99
"""
1010
from llsd.base import (_LLSD, BINARY_MIME_TYPE, NOTATION_MIME_TYPE, XML_MIME_TYPE, LLSDParseError,
1111
LLSDSerializationError, LongType, UnicodeType, binary, starts_with, undef, uri)
12-
from llsd.serde_binary import format_binary, parse_binary
13-
from llsd.serde_notation import format_notation, parse_notation
14-
from llsd.serde_xml import format_pretty_xml, format_xml, parse_xml
15-
16-
__all__ = [
17-
"BINARY_MIME_TYPE",
18-
"LLSD",
19-
"LLSDParseError",
20-
"LLSDSerializationError",
21-
"LongType",
22-
"NOTATION_MIME_TYPE",
23-
"UnicodeType",
24-
"XML_MIME_TYPE",
25-
"binary",
26-
"format_binary",
27-
"format_notation",
28-
"format_pretty_xml",
29-
"format_xml",
30-
"parse",
31-
"parse_binary",
32-
"parse_notation",
33-
"parse_xml",
34-
"undef",
35-
"uri",
36-
]
12+
from llsd.serde_binary import LLSDBinaryParser, format_binary, parse_binary
13+
from llsd.serde_notation import LLSDNotationFormatter, LLSDNotationParser, format_notation, parse_notation
14+
from llsd.serde_xml import LLSDXMLFormatter, LLSDXMLPrettyFormatter, format_pretty_xml, format_xml, parse_xml
3715

3816

3917
def parse(something, mime_type = None):
@@ -81,4 +59,4 @@ def __str__(self):
8159
as_xml = staticmethod(format_xml)
8260
as_pretty_xml = staticmethod(format_pretty_xml)
8361
as_binary = staticmethod(format_binary)
84-
as_notation = staticmethod(format_notation)
62+
as_notation = staticmethod(format_notation)

0 commit comments

Comments
 (0)