clean for merge into master

openhab-scripters · Jun 5, 2019 · bb2ae94 · bb2ae94
1 parent 4c5d637
commit bb2ae94
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 5 deletions.
diff --git a/Core/automation/lib/python/core/__init__.py b/Core/automation/lib/python/core/__init__.py
@@ -1,9 +1,11 @@
-# This check for the existence of 'scope' and verifying it is not a mock.Mock
-# instance are needed for Sphinx autodoc because it tries to search all attrs
-import mock
-from core import jsr223
+try:
+ # if this check fails we assume we are in Jython
+ # if this check passes we assume we are in Python building docs
+ # this is needed to avoid errors with autodoc iterating over all methods
+ # and erroring with the attribute-getter below
+ import mock
 
-if hasattr(jsr223, 'scope') and not isinstance(jsr223.scope, mock.Mock):
+except:
 
  from core.jsr223.scope import items
 

diff --git a/Docs/Groovy/README.md → Documentation/Groovy/README.md b/Docs/Groovy/README.md → Documentation/Groovy/README.md
diff --git a/Docs/Javascript/README.md → Documentation/Javascript/README.md b/Docs/Javascript/README.md → Documentation/Javascript/README.md
diff --git a/Docs/Python/But-How-Do-I.md → Documentation/Python/But-How-Do-I.md b/Docs/Python/But-How-Do-I.md → Documentation/Python/But-How-Do-I.md
diff --git a/Docs/Python/Community.md → Documentation/Python/Community.md b/Docs/Python/Community.md → Documentation/Python/Community.md
diff --git a/Docs/Python/Component-Scripts.md → Documentation/Python/Component-Scripts.md b/Docs/Python/Component-Scripts.md → Documentation/Python/Component-Scripts.md
diff --git a/Docs/Python/Defining-Rules.md → Documentation/Python/Defining-Rules.md b/Docs/Python/Defining-Rules.md → Documentation/Python/Defining-Rules.md
diff --git a/Docs/Python/Docker.md → Documentation/Python/Docker.md b/Docs/Python/Docker.md → Documentation/Python/Docker.md
diff --git a/Docs/Python/Event-Object-Attributes.md → ...ntation/Python/Event-Object-Attributes.md b/Docs/Python/Event-Object-Attributes.md → ...ntation/Python/Event-Object-Attributes.md
diff --git a/Docs/Python/Example-Scripts.md → Documentation/Python/Example-Scripts.md b/Docs/Python/Example-Scripts.md → Documentation/Python/Example-Scripts.md
diff --git a/Docs/Python/Getting-Started.md → Documentation/Python/Getting-Started.md b/Docs/Python/Getting-Started.md → Documentation/Python/Getting-Started.md
diff --git a/Docs/Python/Jython-Modules.md → Documentation/Python/Jython-Modules.md b/Docs/Python/Jython-Modules.md → Documentation/Python/Jython-Modules.md
diff --git a/Docs/Python/README.md → Documentation/Python/README.md b/Docs/Python/README.md → Documentation/Python/README.md