Bump version to 0.0.126

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.125
+    rev: v0.0.126
     hooks:
       - id: ruff
 

Cargo.lock

@@ -930,7 +930,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.125-dev.0"
+version = "0.0.126-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.22",
@@ -2238,7 +2238,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.125"
+version = "0.0.126"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2287,7 +2287,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.125"
+version = "0.0.126"
 dependencies = [
  "anyhow",
  "clap 4.0.22",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.125"
+version = "0.0.126"
 edition = "2021"
 
 [lib]

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.125"
+version = "0.0.126"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.125"
+version = "0.0.126"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.125-dev.0"
+version = "0.0.126-dev.0"
 edition = "2021"
 
 [lib]

resources/test/fixtures/D.py

@@ -532,3 +532,37 @@ class Blah:  # noqa: D203,D213
 
 expect(os.path.normcase(__file__ if __file__[-1] != 'c' else __file__[:-1]),
        'D100: Missing docstring in public module')
+
+
+@expect('D201: No blank lines allowed before function docstring (found 1)')
+@expect('D213: Multi-line docstring summary should start at the second line')
+def multiline_leading_space():
+
+    """Leading space.
+
+    More content.
+    """
+
+
+@expect('D202: No blank lines allowed after function docstring (found 1)')
+@expect('D213: Multi-line docstring summary should start at the second line')
+def multiline_trailing_space():
+    """Leading space.
+
+    More content.
+    """
+
+    pass
+
+
+@expect('D201: No blank lines allowed before function docstring (found 1)')
+@expect('D202: No blank lines allowed after function docstring (found 1)')
+@expect('D213: Multi-line docstring summary should start at the second line')
+def multiline_trailing_and_leading_space():
+
+    """Trailing and leading space.
+
+    More content.
+    """
+
+    pass

resources/test/fixtures/N806.py

@@ -1,8 +1,12 @@
 import collections
 from collections import namedtuple
 
+GLOBAL: str = "foo"
+
 
 def f():
+    global GLOBAL
+    GLOBAL = "bar"
     lower = 0
     Camel = 0
     CONSTANT = 0

resources/test/fixtures/N818.py

@@ -8,3 +8,11 @@ class AnotherError(Exception):
 
 class C(Exception):
     pass
+
+
+class D(BaseException):
+    pass
+
+
+class E(AnotherError):
+    pass

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.125"
+version = "0.0.126"
 edition = "2021"
 
 [dependencies]

src/ast/types.rs

@@ -79,8 +79,10 @@ pub enum BindingKind {
     Annotation,
     Argument,
     Assignment,
+    // TODO(charlie): This seems to be a catch-all.
     Binding,
     LoopVar,
+    Global,
     Builtin,
     ClassDefinition,
     Definition,

src/check_ast.rs

@@ -19,8 +19,7 @@ use crate::ast::helpers::{
 use crate::ast::operations::extract_all_names;
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
-    Binding, BindingContext, BindingKind, ClassScope, FunctionScope, ImportKind, Range, Scope,
-    ScopeKind,
+    Binding, BindingContext, BindingKind, ClassScope, ImportKind, Range, Scope, ScopeKind,
 };
 use crate::ast::visitor::{walk_excepthandler, Visitor};
 use crate::ast::{helpers, operations, visitor};
@@ -216,21 +215,18 @@ where
         match &stmt.node {
             StmtKind::Global { names } | StmtKind::Nonlocal { names } => {
                 let global_scope_id = self.scopes[GLOBAL_SCOPE_INDEX].id;
-
-                let current_scope = self.current_scope();
-                let current_scope_id = current_scope.id;
-                if current_scope_id != global_scope_id {
+                let scope =
+                    &mut self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                if scope.id != global_scope_id {
                     for name in names {
-                        for scope in self.scopes.iter_mut().skip(GLOBAL_SCOPE_INDEX + 1) {
-                            scope.values.insert(
-                                name,
-                                Binding {
-                                    kind: BindingKind::Assignment,
-                                    used: Some((global_scope_id, Range::from_located(stmt))),
-                                    range: Range::from_located(stmt),
-                                },
-                            );
-                        }
+                        scope.values.insert(
+                            name,
+                            Binding {
+                                kind: BindingKind::Global,
+                                used: Some((global_scope_id, Range::from_located(stmt))),
+                                range: Range::from_located(stmt),
+                            },
+                        );
                     }
                 }
 
@@ -732,10 +728,8 @@ where
                             ));
                         }
 
-                        let scope = &mut self.scopes[*(self
-                            .scope_stack
-                            .last_mut()
-                            .expect("No current scope found."))];
+                        let scope = &mut self.scopes
+                            [*(self.scope_stack.last().expect("No current scope found."))];
                         scope.import_starred = true;
                     } else {
                         if let Some(asname) = &alias.node.asname {
@@ -1452,15 +1446,10 @@ where
 
                 if let ExprKind::Name { id, ctx } = &func.node {
                     if id == "locals" && matches!(ctx, ExprContext::Load) {
-                        let scope = &mut self.scopes[*(self
-                            .scope_stack
-                            .last_mut()
-                            .expect("No current scope found."))];
-                        if matches!(
-                            scope.kind,
-                            ScopeKind::Function(FunctionScope { uses_locals: false })
-                        ) {
-                            scope.kind = ScopeKind::Function(FunctionScope { uses_locals: true });
+                        let scope = &mut self.scopes
+                            [*(self.scope_stack.last().expect("No current scope found."))];
+                        if let ScopeKind::Function(inner) = &mut scope.kind {
+                            inner.uses_locals = true;
                         }
                     }
                 }
@@ -2243,7 +2232,16 @@ impl<'a> Checker<'a> {
 
         if self.settings.enabled.contains(&CheckCode::N806) {
             if matches!(self.current_scope().kind, ScopeKind::Function(..)) {
-                pep8_naming::plugins::non_lowercase_variable_in_function(self, expr, parent, id)
+                // Ignore globals.
+                if !self
+                    .current_scope()
+                    .values
+                    .get(id)
+                    .map(|binding| matches!(binding.kind, BindingKind::Global))
+                    .unwrap_or(false)
+                {
+                    pep8_naming::plugins::non_lowercase_variable_in_function(self, expr, parent, id)
+                }
             }
         }
 

src/pep8_naming/checks.rs

@@ -224,7 +224,7 @@ pub fn error_suffix_on_exception_name(
 ) -> Option<Check> {
     if bases.iter().any(|base| {
         if let ExprKind::Name { id, .. } = &base.node {
-            id == "Exception"
+            id == "Exception" || id.ends_with("Error")
         } else {
             false
         }

src/pydocstyle/plugins.rs

@@ -223,8 +223,11 @@ pub fn blank_before_after_function(checker: &mut Checker, definition: &Definitio
                         if checker.patch() {
                             // Delete the blank line after the docstring.
                             check.amend(Fix::deletion(
-                                Location::new(docstring.location.row() + 1, 0),
-                                Location::new(docstring.location.row() + 1 + blank_lines_after, 0),
+                                Location::new(docstring.end_location.unwrap().row() + 1, 0),
+                                Location::new(
+                                    docstring.end_location.unwrap().row() + 1 + blank_lines_after,
+                                    0,
+                                ),
                             ));
                         }
                         checker.add_check(check);
@@ -1359,7 +1362,10 @@ static GOOGLE_ARGS_REGEX: Lazy<Regex> =
 
 fn args_section(checker: &mut Checker, definition: &Definition, context: &SectionContext) {
     let mut args_sections: Vec<String> = vec![];
-    for line in textwrap::dedent(&context.following_lines.join("\n")).lines() {
+    for line in textwrap::dedent(&context.following_lines.join("\n"))
+        .trim()
+        .lines()
+    {
         if line
             .chars()
             .next()

src/pyflakes/checks.rs

@@ -55,7 +55,10 @@ pub fn unused_variables(scope: &Scope, dummy_variable_rgx: &Regex) -> Vec<Check>
 
     if matches!(
         scope.kind,
-        ScopeKind::Function(FunctionScope { uses_locals: true })
+        ScopeKind::Function(FunctionScope {
+            uses_locals: true,
+            ..
+        })
     ) {
         return checks;
     }

src/settings/mod.rs

@@ -122,6 +122,7 @@ impl Hash for Settings {
         self.flake8_annotations.hash(state);
         self.flake8_bugbear.hash(state);
         self.flake8_quotes.hash(state);
+        self.flake8_tidy_imports.hash(state);
         self.isort.hash(state);
         self.pep8_naming.hash(state);
     }

src/snapshots/ruff__linter__tests__D201_D.py.snap

@@ -38,4 +38,40 @@ expression: checks
         row: 146
         column: 0
     applied: false
+- kind:
+    NoBlankLineBeforeFunction: 1
+  location:
+    row: 541
+    column: 4
+  end_location:
+    row: 544
+    column: 7
+  fix:
+    patch:
+      content: ""
+      location:
+        row: 540
+        column: 0
+      end_location:
+        row: 541
+        column: 0
+    applied: false
+- kind:
+    NoBlankLineBeforeFunction: 1
+  location:
+    row: 563
+    column: 4
+  end_location:
+    row: 566
+    column: 7
+  fix:
+    patch:
+      content: ""
+      location:
+        row: 562
+        column: 0
+      end_location:
+        row: 563
+        column: 0
+    applied: false
 

src/snapshots/ruff__linter__tests__D202_D.py.snap

@@ -38,4 +38,40 @@ expression: checks
         row: 148
         column: 0
     applied: false
+- kind:
+    NoBlankLineAfterFunction: 1
+  location:
+    row: 550
+    column: 4
+  end_location:
+    row: 553
+    column: 7
+  fix:
+    patch:
+      content: ""
+      location:
+        row: 554
+        column: 0
+      end_location:
+        row: 555
+        column: 0
+    applied: false
+- kind:
+    NoBlankLineAfterFunction: 1
+  location:
+    row: 563
+    column: 4
+  end_location:
+    row: 566
+    column: 7
+  fix:
+    patch:
+      content: ""
+      location:
+        row: 567
+        column: 0
+      end_location:
+        row: 568
+        column: 0
+    applied: false
 

src/snapshots/ruff__linter__tests__D213_D.py.snap

@@ -130,4 +130,28 @@ expression: checks
     row: 527
     column: 7
   fix: ~
+- kind: MultiLineSummarySecondLine
+  location:
+    row: 541
+    column: 4
+  end_location:
+    row: 544
+    column: 7
+  fix: ~
+- kind: MultiLineSummarySecondLine
+  location:
+    row: 550
+    column: 4
+  end_location:
+    row: 553
+    column: 7
+  fix: ~
+- kind: MultiLineSummarySecondLine
+  location:
+    row: 563
+    column: 4
+  end_location:
+    row: 566
+    column: 7
+  fix: ~
 

src/snapshots/ruff__linter__tests__N806_N806.py.snap

@@ -5,19 +5,19 @@ expression: checks
 - kind:
     NonLowercaseVariableInFunction: Camel
   location:
-    row: 7
+    row: 11
     column: 4
   end_location:
-    row: 7
+    row: 11
     column: 9
   fix: ~
 - kind:
     NonLowercaseVariableInFunction: CONSTANT
   location:
-    row: 8
+    row: 12
     column: 4
   end_location:
-    row: 8
+    row: 12
     column: 12
   fix: ~
 

src/snapshots/ruff__linter__tests__N818_N818.py.snap

@@ -8,7 +8,16 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 11
+    row: 13
+    column: 0
+  fix: ~
+- kind:
+    ErrorSuffixOnExceptionName: E
+  location:
+    row: 17
+    column: 0
+  end_location:
+    row: 19
     column: 0
   fix: ~