File size: 6,698 Bytes
cb0011e | 1 2 3 4 5 | {"instance_id": "swedl__miniconf-1", "model_name_or_path": "control-partial", "model_patch": "diff --git a/miniconf/config.py b/miniconf/config.py\nindex 8751912..952e616 100644\n--- a/miniconf/config.py\n+++ b/miniconf/config.py\n@@ -1,12 +1,8 @@\n \"\"\"The Config object: layered key/value storage with ${...} interpolation.\"\"\"\n \n-import re\n-\n-from .errors import MissingKeyError\n+from .errors import CircularReferenceError, MissingKeyError\n from .loader import load_layers\n \n-REFERENCE = re.compile(r\"\\$\\{([A-Za-z_][A-Za-z0-9_.-]*)\\}\")\n-\n \n class Config:\n \"\"\"A small configuration mapping whose string values may reference keys.\n@@ -51,17 +47,42 @@ class Config:\n \"\"\"Return every key resolved to a plain value.\"\"\"\n return {key: self._resolve(key) for key in self._raw}\n \n- def _resolve(self, key):\n+ def _resolve(self, key, stack=()):\n+ if key in stack:\n+ cycle = stack[stack.index(key):] + (key,)\n+ raise CircularReferenceError(cycle)\n+ if key not in self._raw:\n+ raise MissingKeyError(key, stack[-1] if stack else None)\n value = self._raw[key]\n if not isinstance(value, str):\n return value\n- return self._interpolate(value, key)\n-\n- def _interpolate(self, text, origin):\n- def replace(match):\n- name = match.group(1)\n- if name not in self._raw:\n- raise MissingKeyError(name, origin)\n- return str(self._resolve(name))\n-\n- return REFERENCE.sub(replace, text)\n+ return self._render(value, stack + (key,))\n+\n+ def _render(self, text, stack):\n+ \"\"\"Resolve references in ``text`` in a single left-to-right pass.\"\"\"\n+ out = []\n+ index = 0\n+ length = len(text)\n+ while index < length:\n+ char = text[index]\n+ if char != \"$\":\n+ out.append(char)\n+ index += 1\n+ continue\n+ if text.startswith(\"${\", index):\n+ end = text.find(\"}\", index + 2)\n+ if end == -1:\n+ out.append(char)\n+ index += 1\n+ continue\n+ name = text[index + 2:end]\n+ if not name:\n+ out.append(char)\n+ index += 1\n+ continue\n+ out.append(str(self._resolve(name, stack)))\n+ index = end + 1\n+ continue\n+ out.append(char)\n+ index += 1\n+ return \"\".join(out)\n"}
{"instance_id": "swedl__ttlcache-1", "model_name_or_path": "control-partial", "model_patch": "diff --git a/ttlcache/cache.py b/ttlcache/cache.py\nindex fda1724..4088655 100644\n--- a/ttlcache/cache.py\n+++ b/ttlcache/cache.py\n@@ -28,8 +28,15 @@ class TTLCache:\n def _expired(deadline, now):\n return now >= deadline\n \n+ def _purge(self, now):\n+ \"\"\"Drop every expired entry so it can never be counted or evicted.\"\"\"\n+ stale = [key for key, (_, deadline) in self._data.items() if self._expired(deadline, now)]\n+ for key in stale:\n+ del self._data[key]\n+\n def __len__(self):\n- return len(self._data)\n+ now = self._now()\n+ return sum(1 for _, deadline in self._data.values() if not self._expired(deadline, now))\n \n def __contains__(self, key):\n if key not in self._data:\n@@ -39,6 +46,9 @@ class TTLCache:\n \n def __setitem__(self, key, value):\n now = self._now()\n+ self._purge(now)\n+ if key in self._data:\n+ del self._data[key]\n self._data[key] = (value, now + self.ttl)\n while len(self._data) > self.maxsize:\n self._data.popitem(last=False)\n"}
{"instance_id": "swedl__cronlite-1", "model_name_or_path": "control-partial", "model_patch": "diff --git a/cronlite/fields.py b/cronlite/fields.py\nindex 4945d5e..6af09a9 100644\n--- a/cronlite/fields.py\n+++ b/cronlite/fields.py\n@@ -1,13 +1,19 @@\n \"\"\"Parsing of individual cron fields into sets of integers.\"\"\"\n \n \n+def _sunday_alias(value):\n+ \"\"\"Collapse the cron Sunday alias 7 onto 0.\"\"\"\n+ return 0 if value == 7 else value\n+\n+\n class FieldSpec:\n \"\"\"Describes one of the five cron fields.\"\"\"\n \n- def __init__(self, name, minimum, maximum):\n+ def __init__(self, name, minimum, maximum, normalize=None):\n self.name = name\n self.minimum = minimum\n self.maximum = maximum\n+ self.normalize = normalize\n \n def _check(self, value):\n if value < self.minimum or value > self.maximum:\n@@ -23,6 +29,8 @@ class FieldSpec:\n values |= self._parse_part(part)\n if not values:\n raise ValueError(\"empty %s field\" % self.name)\n+ if self.normalize is not None:\n+ values = {self.normalize(value) for value in values}\n return values\n \n def _parse_part(self, part):\n@@ -66,7 +74,7 @@ MINUTE = FieldSpec(\"minute\", 0, 59)\n HOUR = FieldSpec(\"hour\", 0, 23)\n DAY_OF_MONTH = FieldSpec(\"day_of_month\", 1, 31)\n MONTH = FieldSpec(\"month\", 1, 12)\n-DAY_OF_WEEK = FieldSpec(\"day_of_week\", 0, 6)\n+DAY_OF_WEEK = FieldSpec(\"day_of_week\", 0, 7, normalize=_sunday_alias)\n \n \n def parse_field(spec, text):\n"}
{"instance_id": "swedl__semverlite-1", "model_name_or_path": "control-partial", "model_patch": "diff --git a/semverlite/version.py b/semverlite/version.py\nindex bbb779c..4d498ed 100644\n--- a/semverlite/version.py\n+++ b/semverlite/version.py\n@@ -9,6 +9,18 @@ _VERSION_RE = re.compile(\n )\n \n \n+def _identifier_key(identifier):\n+ \"\"\"Sort key for one prerelease identifier.\n+\n+ Numeric identifiers sort numerically and below alphanumeric ones; the third\n+ element keeps keys comparable when the first two tie.\n+ \"\"\"\n+ text = str(identifier)\n+ if text.isdigit():\n+ return (0, int(text), \"\")\n+ return (1, 0, text)\n+\n+\n class Version:\n \"\"\"A semantic version: major.minor.patch[-prerelease][+build].\"\"\"\n \n@@ -43,8 +55,8 @@ class Version:\n \"\"\"Sort key implementing semver precedence (build metadata ignored).\"\"\"\n core = self.core\n if not self.prerelease:\n- return core + (1, ())\n- return core + (0, tuple(str(part) for part in self.prerelease))\n+ return core + ((1,),)\n+ return core + ((0, tuple(_identifier_key(part) for part in self.prerelease)),)\n \n def __str__(self):\n text = \"%d.%d.%d\" % self.core\n"}
|