Release 3.4.5

roo-oliv · Mar 11, 2021 · 7c2c4a5 · 7c2c4a5
1 parent 5706b64
commit 7c2c4a5
Show file tree

Hide file tree

Showing 57 changed files with 11,638 additions and 529 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.4.4
+current_version = 3.4.5
 
 [bumpversion:file:Makefile]
 search = CURRENT_VERSION = {current_version}

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+3.4.5 (2021-03-11)
+------------------
+
+* Fix opening of UTF-8 files & allow for user set encoding
+
 3.4.4 (2020-07-29)
 ------------------
 

diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ docs:
  make html -B
  cp -a build/html/. docs
 
-CURRENT_VERSION = 3.4.4
+CURRENT_VERSION = 3.4.5
 
 .PHONY: bump-patch-version
 bump-patch-version:

diff --git a/docs/.buildinfo b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: bf2877d486378e206f0b68d7a300d807
+config: cd3b2dd68ba32c44728db81e4f0960c3
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
@@ -3,9 +3,10 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>Overview: module code &#8212; injectable 3.4.4 documentation</title>
- <link rel="stylesheet" href="../_static/pydoctheme.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>Overview: module code &#8212; injectable 3.4.5 documentation</title>
  <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pydoctheme.css" type="text/css" />
 
  <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
  <script src="../_static/jquery.js"></script>
@@ -28,7 +29,7 @@
  <h3>Navigation</h3>
  <ul>
  <li class="responsive-menu"><a href="#sidebar-anchor" title="Navigation">&#9776;</a></li>
- <li><a href="../index.html">injectable-3.4.4</a> &#187;</li> 
+ <li><a href="../index.html">injectable-3.4.5</a> &#187;</li> 
  </ul>
  </div>
 
@@ -60,6 +61,7 @@ <h1>All modules for which code is available</h1>
 <li><a href="injectable/testing/reset_injection_container_util.html">injectable.testing.reset_injection_container_util</a></li>
 </ul>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
@@ -106,8 +108,8 @@ <h3>Navigation</h3>
 
  <div class="footer" role="contentinfo">
  &#169; Copyright 2018, Rodrigo Martins de Oliveira.
- Last updated on Jul 29, 2020.
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 3.0.3.
+ Last updated on Mar 11, 2021.
+ Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 3.3.1.
  </div>
  </body>
 </html>
diff --git a/docs/_modules/injectable/autowiring/autowired_decorator.html b/docs/_modules/injectable/autowiring/autowired_decorator.html
@@ -3,9 +3,10 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>injectable.autowiring.autowired_decorator &#8212; injectable 3.4.4 documentation</title>
- <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>injectable.autowiring.autowired_decorator &#8212; injectable 3.4.5 documentation</title>
  <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
 
  <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
  <script src="../../../_static/jquery.js"></script>
@@ -28,7 +29,7 @@
  <h3>Navigation</h3>
  <ul>
  <li class="responsive-menu"><a href="#sidebar-anchor" title="Navigation">&#9776;</a></li>
- <li><a href="../../../index.html">injectable-3.4.4</a> &#187;</li>
+ <li><a href="../../../index.html">injectable-3.4.5</a> &#187;</li>
  <li><a href="../../index.html" accesskey="U">Module code</a> &#187;</li> 
  </ul>
  </div>
@@ -127,6 +128,7 @@ <h1>Source code for injectable.autowiring.autowired_decorator</h1><div class="hi
  <span class="k">return</span> <span class="n">wrapper</span></div>
 </pre></div>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
@@ -173,8 +175,8 @@ <h3>Navigation</h3>
 
  <div class="footer" role="contentinfo">
  &#169; Copyright 2018, Rodrigo Martins de Oliveira.
- Last updated on Jul 29, 2020.
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 3.0.3.
+ Last updated on Mar 11, 2021.
+ Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 3.3.1.
  </div>
  </body>
 </html>
diff --git a/docs/_modules/injectable/autowiring/autowired_type.html b/docs/_modules/injectable/autowiring/autowired_type.html
@@ -3,9 +3,10 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>injectable.autowiring.autowired_type &#8212; injectable 3.4.4 documentation</title>
- <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>injectable.autowiring.autowired_type &#8212; injectable 3.4.5 documentation</title>
  <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
 
  <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
  <script src="../../../_static/jquery.js"></script>
@@ -28,7 +29,7 @@
  <h3>Navigation</h3>
  <ul>
  <li class="responsive-menu"><a href="#sidebar-anchor" title="Navigation">&#9776;</a></li>
- <li><a href="../../../index.html">injectable-3.4.4</a> &#187;</li>
+ <li><a href="../../../index.html">injectable-3.4.5</a> &#187;</li>
  <li><a href="../../index.html" accesskey="U">Module code</a> &#187;</li> 
  </ul>
  </div>
@@ -190,6 +191,7 @@ <h1>Source code for injectable.autowiring.autowired_type</h1><div class="highlig
  <span class="p">)</span></div>
 </pre></div>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
@@ -236,8 +238,8 @@ <h3>Navigation</h3>
 
  <div class="footer" role="contentinfo">
  &#169; Copyright 2018, Rodrigo Martins de Oliveira.
- Last updated on Jul 29, 2020.
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 3.0.3.
+ Last updated on Mar 11, 2021.
+ Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 3.3.1.
  </div>
  </body>
 </html>
diff --git a/docs/_modules/injectable/container/injectable.html b/docs/_modules/injectable/container/injectable.html
@@ -3,9 +3,10 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>injectable.container.injectable &#8212; injectable 3.4.4 documentation</title>
- <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>injectable.container.injectable &#8212; injectable 3.4.5 documentation</title>
  <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
 
  <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
  <script src="../../../_static/jquery.js"></script>
@@ -28,7 +29,7 @@
  <h3>Navigation</h3>
  <ul>
  <li class="responsive-menu"><a href="#sidebar-anchor" title="Navigation">&#9776;</a></li>
- <li><a href="../../../index.html">injectable-3.4.4</a> &#187;</li>
+ <li><a href="../../../index.html">injectable-3.4.5</a> &#187;</li>
  <li><a href="../../index.html" accesskey="U">Module code</a> &#187;</li> 
  </ul>
  </div>
@@ -97,6 +98,7 @@ <h1>Source code for injectable.container.injectable</h1><div class="highlight"><
  <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">factory</span><span class="p">()</span></div>
 </pre></div>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
@@ -143,8 +145,8 @@ <h3>Navigation</h3>
 
  <div class="footer" role="contentinfo">
  &#169; Copyright 2018, Rodrigo Martins de Oliveira.
- Last updated on Jul 29, 2020.
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 3.0.3.
+ Last updated on Mar 11, 2021.
+ Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 3.3.1.
  </div>
  </body>
 </html>
diff --git a/docs/_modules/injectable/container/injection_container.html b/docs/_modules/injectable/container/injection_container.html
@@ -3,9 +3,10 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>injectable.container.injection_container &#8212; injectable 3.4.4 documentation</title>
- <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>injectable.container.injection_container &#8212; injectable 3.4.5 documentation</title>
  <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../../../_static/pydoctheme.css" type="text/css" />
 
  <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
  <script src="../../../_static/jquery.js"></script>
@@ -28,7 +29,7 @@
  <h3>Navigation</h3>
  <ul>
  <li class="responsive-menu"><a href="#sidebar-anchor" title="Navigation">&#9776;</a></li>
- <li><a href="../../../index.html">injectable-3.4.4</a> &#187;</li>
+ <li><a href="../../../index.html">injectable-3.4.5</a> &#187;</li>
  <li><a href="../../index.html" accesskey="U">Module code</a> &#187;</li> 
  </ul>
  </div>
@@ -90,7 +91,10 @@ <h1>Source code for injectable.container.injection_container</h1><div class="hig
 
 <div class="viewcode-block" id="InjectionContainer.load"><a class="viewcode-back" href="../../../reference/injectable.html#injectable.InjectionContainer.load">[docs]</a> <span class="nd">@classmethod</span>
  <span class="k">def</span> <span class="nf">load</span><span class="p">(</span>
- <span class="bp">cls</span><span class="p">,</span> <span class="n">search_path</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span> <span class="o">*</span><span class="p">,</span> <span class="n">default_namespace</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
+ <span class="bp">cls</span><span class="p">,</span>
+ <span class="n">search_path</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
+ <span class="o">*</span><span class="p">,</span>
+ <span class="n">default_namespace</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
  <span class="p">):</span>
  <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd"> Loads injectables under the search path to the :class:`InjectionContainer`</span>
@@ -184,7 +188,7 @@ <h1>Source code for injectable.container.injection_container</h1><div class="hig
  <span class="k">def</span> <span class="nf">_link_dependencies</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">search_path</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
  <span class="n">files</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_collect_python_files</span><span class="p">(</span><span class="n">search_path</span><span class="p">)</span>
  <span class="k">for</span> <span class="n">file</span> <span class="ow">in</span> <span class="n">files</span><span class="p">:</span>
- <span class="k">if</span> <span class="ow">not</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_contains_injectables</span><span class="p">(</span><span class="n">file</span><span class="p">):</span>
+ <span class="k">if</span> <span class="ow">not</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_contains_injectables</span><span class="p">(</span><span class="n">file</span><span class="p">,</span> <span class="n">encoding</span><span class="o">=</span><span class="s2">&quot;utf-8&quot;</span><span class="p">):</span>
  <span class="k">continue</span>
  <span class="k">if</span> <span class="n">file</span><span class="o">.</span><span class="n">path</span> <span class="ow">in</span> <span class="bp">cls</span><span class="o">.</span><span class="n">LOADED_FILEPATHS</span><span class="p">:</span>
  <span class="k">continue</span>
@@ -194,11 +198,13 @@ <h1>Source code for injectable.container.injection_container</h1><div class="hig
  <span class="bp">cls</span><span class="o">.</span><span class="n">LOADING_FILEPATH</span> <span class="o">=</span> <span class="kc">None</span>
 
  <span class="nd">@classmethod</span>
- <span class="k">def</span> <span class="nf">load_dependencies_from</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">absolute_search_path</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">default_namespace</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
+ <span class="k">def</span> <span class="nf">load_dependencies_from</span><span class="p">(</span>
+ <span class="bp">cls</span><span class="p">,</span> <span class="n">absolute_search_path</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">default_namespace</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">encoding</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="s2">&quot;utf-8&quot;</span>
+ <span class="p">):</span>
  <span class="n">files</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_collect_python_files</span><span class="p">(</span><span class="n">absolute_search_path</span><span class="p">)</span>
  <span class="bp">cls</span><span class="o">.</span><span class="n">LOADING_DEFAULT_NAMESPACE</span> <span class="o">=</span> <span class="n">default_namespace</span>
  <span class="k">for</span> <span class="n">file</span> <span class="ow">in</span> <span class="n">files</span><span class="p">:</span>
- <span class="k">if</span> <span class="ow">not</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_contains_injectables</span><span class="p">(</span><span class="n">file</span><span class="p">):</span>
+ <span class="k">if</span> <span class="ow">not</span> <span class="bp">cls</span><span class="o">.</span><span class="n">_contains_injectables</span><span class="p">(</span><span class="n">file</span><span class="p">,</span> <span class="n">encoding</span><span class="p">):</span>
  <span class="k">continue</span>
  <span class="k">if</span> <span class="n">file</span><span class="o">.</span><span class="n">path</span> <span class="ow">in</span> <span class="bp">cls</span><span class="o">.</span><span class="n">LOADED_FILEPATHS</span><span class="p">:</span>
  <span class="k">continue</span>
@@ -214,8 +220,8 @@ <h1>Source code for injectable.container.injection_container</h1><div class="hig
  <span class="k">return</span> <span class="n">collector</span><span class="o">.</span><span class="n">collect</span><span class="p">(</span><span class="n">search_path</span><span class="p">)</span>
 
  <span class="nd">@classmethod</span>
- <span class="k">def</span> <span class="nf">_contains_injectables</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">file_entry</span><span class="p">:</span> <span class="n">os</span><span class="o">.</span><span class="n">DirEntry</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
- <span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="n">file_entry</span><span class="p">)</span> <span class="k">as</span> <span class="n">file</span><span class="p">:</span>
+ <span class="k">def</span> <span class="nf">_contains_injectables</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">file_entry</span><span class="p">:</span> <span class="n">os</span><span class="o">.</span><span class="n">DirEntry</span><span class="p">,</span> <span class="n">encoding</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
+ <span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="n">file_entry</span><span class="p">,</span> <span class="n">encoding</span><span class="o">=</span><span class="n">encoding</span><span class="p">)</span> <span class="k">as</span> <span class="n">file</span><span class="p">:</span>
  <span class="n">source</span> <span class="o">=</span> <span class="n">file</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
  <span class="c1"># TODO: Consider the use of ast.parse for this</span>
  <span class="k">return</span> <span class="nb">any</span><span class="p">(</span>
@@ -229,6 +235,7 @@ <h1>Source code for injectable.container.injection_container</h1><div class="hig
  <span class="p">)</span></div>
 </pre></div>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
@@ -275,8 +282,8 @@ <h3>Navigation</h3>
 
  <div class="footer" role="contentinfo">
  &#169; Copyright 2018, Rodrigo Martins de Oliveira.
- Last updated on Jul 29, 2020.
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 3.0.3.
+ Last updated on Mar 11, 2021.
+ Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 3.3.1.
  </div>
  </body>
 </html>