mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 21:33:13 -07:00
Update vendored beets to 1.6.0
Updates colorama to 0.4.6 Adds confuse version 1.7.0 Updates jellyfish to 0.9.0 Adds mediafile 0.10.1 Updates munkres to 1.1.4 Updates musicbrainzngs to 0.7.1 Updates mutagen to 1.46.0 Updates pyyaml to 6.0 Updates unidecode to 1.3.6
This commit is contained in:
Labrys of Knossos
parent
5073ec0c6f
commit
56c6773c6b
385 changed files with 25143 additions and 18080 deletions
|
|
@ -124,10 +124,13 @@ class Scanner:
|
|||
|
||||
def peek_token(self):
|
||||
# Return the next token, but do not delete if from the queue.
|
||||
# Return None if no more tokens.
|
||||
while self.need_more_tokens():
|
||||
self.fetch_more_tokens()
|
||||
if self.tokens:
|
||||
return self.tokens[0]
|
||||
else:
|
||||
return None
|
||||
|
||||
def get_token(self):
|
||||
# Return the next token.
|
||||
|
|
@ -329,7 +332,7 @@ class Scanner:
|
|||
## }
|
||||
#if self.flow_level and self.indent > column:
|
||||
# raise ScannerError(None, None,
|
||||
# "invalid intendation or unclosed '[' or '{'",
|
||||
# "invalid indentation or unclosed '[' or '{'",
|
||||
# self.get_mark())
|
||||
|
||||
# In the flow context, indentation is ignored. We make the scanner less
|
||||
|
|
@ -367,7 +370,7 @@ class Scanner:
|
|||
|
||||
def fetch_stream_end(self):
|
||||
|
||||
# Set the current intendation to -1.
|
||||
# Set the current indentation to -1.
|
||||
self.unwind_indent(-1)
|
||||
|
||||
# Reset simple keys.
|
||||
|
|
@ -386,7 +389,7 @@ class Scanner:
|
|||
|
||||
def fetch_directive(self):
|
||||
|
||||
# Set the current intendation to -1.
|
||||
# Set the current indentation to -1.
|
||||
self.unwind_indent(-1)
|
||||
|
||||
# Reset simple keys.
|
||||
|
|
@ -404,7 +407,7 @@ class Scanner:
|
|||
|
||||
def fetch_document_indicator(self, TokenClass):
|
||||
|
||||
# Set the current intendation to -1.
|
||||
# Set the current indentation to -1.
|
||||
self.unwind_indent(-1)
|
||||
|
||||
# Reset simple keys. Note that there could not be a block collection
|
||||
|
|
@ -516,7 +519,7 @@ class Scanner:
|
|||
# Block context needs additional checks.
|
||||
if not self.flow_level:
|
||||
|
||||
# Are we allowed to start a key (not nessesary a simple)?
|
||||
# Are we allowed to start a key (not necessary a simple)?
|
||||
if not self.allow_simple_key:
|
||||
raise ScannerError(None, None,
|
||||
"mapping keys are not allowed here",
|
||||
|
|
@ -564,7 +567,7 @@ class Scanner:
|
|||
else:
|
||||
|
||||
# Block context needs additional checks.
|
||||
# (Do we really need them? They will be catched by the parser
|
||||
# (Do we really need them? They will be caught by the parser
|
||||
# anyway.)
|
||||
if not self.flow_level:
|
||||
|
||||
|
|
@ -897,7 +900,7 @@ class Scanner:
|
|||
# The specification does not restrict characters for anchors and
|
||||
# aliases. This may lead to problems, for instance, the document:
|
||||
# [ *alias, value ]
|
||||
# can be interpteted in two ways, as
|
||||
# can be interpreted in two ways, as
|
||||
# [ "value" ]
|
||||
# and
|
||||
# [ *alias , "value" ]
|
||||
|
|
@ -1166,6 +1169,7 @@ class Scanner:
|
|||
' ': '\x20',
|
||||
'\"': '\"',
|
||||
'\\': '\\',
|
||||
'/': '/',
|
||||
'N': '\x85',
|
||||
'_': '\xA0',
|
||||
'L': '\u2028',
|
||||
|
|
@ -1207,7 +1211,7 @@ class Scanner:
|
|||
for k in range(length):
|
||||
if self.peek(k) not in '0123456789ABCDEFabcdef':
|
||||
raise ScannerError("while scanning a double-quoted scalar", start_mark,
|
||||
"expected escape sequence of %d hexdecimal numbers, but found %r" %
|
||||
"expected escape sequence of %d hexadecimal numbers, but found %r" %
|
||||
(length, self.peek(k)), self.get_mark())
|
||||
code = int(self.prefix(length), 16)
|
||||
chunks.append(chr(code))
|
||||
|
|
@ -1266,7 +1270,7 @@ class Scanner:
|
|||
def scan_plain(self):
|
||||
# See the specification for details.
|
||||
# We add an additional restriction for the flow context:
|
||||
# plain scalars in the flow context cannot contain ',', ':' and '?'.
|
||||
# plain scalars in the flow context cannot contain ',' or '?'.
|
||||
# We also keep track of the `allow_simple_key` flag here.
|
||||
# Indentation rules are loosed for the flow context.
|
||||
chunks = []
|
||||
|
|
@ -1285,18 +1289,12 @@ class Scanner:
|
|||
while True:
|
||||
ch = self.peek(length)
|
||||
if ch in '\0 \t\r\n\x85\u2028\u2029' \
|
||||
or (not self.flow_level and ch == ':' and
|
||||
self.peek(length+1) in '\0 \t\r\n\x85\u2028\u2029') \
|
||||
or (self.flow_level and ch in ',:?[]{}'):
|
||||
or (ch == ':' and
|
||||
self.peek(length+1) in '\0 \t\r\n\x85\u2028\u2029'
|
||||
+ (u',[]{}' if self.flow_level else u''))\
|
||||
or (self.flow_level and ch in ',?[]{}'):
|
||||
break
|
||||
length += 1
|
||||
# It's not clear what we should do with ':' in the flow context.
|
||||
if (self.flow_level and ch == ':'
|
||||
and self.peek(length+1) not in '\0 \t\r\n\x85\u2028\u2029,[]{}'):
|
||||
self.forward(length)
|
||||
raise ScannerError("while scanning a plain scalar", start_mark,
|
||||
"found unexpected ':'", self.get_mark(),
|
||||
"Please check http://pyyaml.org/wiki/YAMLColonInFlowContext for details.")
|
||||
if length == 0:
|
||||
break
|
||||
self.allow_simple_key = False
|
||||
|
|
@ -1405,7 +1403,7 @@ class Scanner:
|
|||
for k in range(2):
|
||||
if self.peek(k) not in '0123456789ABCDEFabcdef':
|
||||
raise ScannerError("while scanning a %s" % name, start_mark,
|
||||
"expected URI escape sequence of 2 hexdecimal numbers, but found %r"
|
||||
"expected URI escape sequence of 2 hexadecimal numbers, but found %r"
|
||||
% self.peek(k), self.get_mark())
|
||||
codes.append(int(self.prefix(2), 16))
|
||||
self.forward(2)
|
||||
|
|
@ -1435,10 +1433,3 @@ class Scanner:
|
|||
self.forward()
|
||||
return ch
|
||||
return ''
|
||||
|
||||
#try:
|
||||
# import psyco
|
||||
# psyco.bind(Scanner)
|
||||
#except ImportError:
|
||||
# pass
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue