Add workaround for latest regex version failing on __version__ access (…

…#105)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2017 Isaac Muse
+Copyright (c) 2016 - 2019 Isaac Muse
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -24,7 +24,7 @@ http://facelessuser.github.io/backrefs/
 
 Released under the MIT license.
 
-Copyright (c) 2015 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2015 - 2019 Isaac Muse <isaacmuse@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

backrefs/__meta__.py

@@ -186,5 +186,5 @@ def parse_version(ver, pre=False):
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(4, 0, 1, "final")
+__version_info__ = Version(4, 0, 2, "final")
 __version__ = __version_info__._get_canonical()

backrefs/_bre_parse.py

@@ -2,7 +2,7 @@
 Backrefs Re parser.
 
 Licensed under MIT
-Copyright (c) 2011 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2011 - 2019 Isaac Muse <isaacmuse@gmail.com>
 """
 from __future__ import unicode_literals
 import re as _re

backrefs/_bregex_parse.py

@@ -2,15 +2,25 @@
 Backrefs Regex parser.
 
 Licensed under MIT
-Copyright (c) 2011 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2011 - 2019 Isaac Muse <isaacmuse@gmail.com>
 """
 from __future__ import unicode_literals
 import unicodedata as _unicodedata
 import copyreg as _copyreg
 from . import util as _util
 import regex as _regex
 
-_REGEX_COMMENT_FIX = tuple([int(x) for x in _regex.__version__.split('.')]) > (2, 4, 136)
+try:  # pragma: no cover
+    from regex import __version__ as _regex_version
+except ImportError:  # pragma: no cover
+    from regex.regex import __version__ as _regex_version
+
+try:  # pragma: no cover
+    from regex import _compile_replacement_helper
+except ImportError:  # pragma: no cover
+    from regex.regex import _compile_replacement_helper
+
+_REGEX_COMMENT_FIX = tuple([int(x) for x in _regex_version.split('.')]) > (2, 4, 136)
 
 _ASCII_LETTERS = frozenset(
     (
@@ -979,7 +989,7 @@ def regex_parse_template(self, template, pattern):
 
         groups = []
         literals = []
-        replacements = _regex._compile_replacement_helper(pattern, template)
+        replacements = _compile_replacement_helper(pattern, template)
         count = 0
         for part in replacements:
             if isinstance(part, int):

backrefs/bre.py

@@ -23,7 +23,7 @@
  - `\X`                                                          - Simplified grapheme clusters (search)
 
 Licensed under MIT
-Copyright (c) 2011 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2011 - 2019 Isaac Muse <isaacmuse@gmail.com>
 """
 from __future__ import unicode_literals
 import sys as _sys

backrefs/bregex.py

@@ -12,7 +12,7 @@
  - `\e`                                                         - Escape character (search)
 
 Licensed under MIT
-Copyright (c) 2015 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2015 - 2019 Isaac Muse <isaacmuse@gmail.com>
 """
 from __future__ import unicode_literals
 import regex as _regex

backrefs/util.py

@@ -2,7 +2,7 @@
 Utilities and compatibility abstraction.
 
 Licensed under MIT
-Copyright (c) 2015 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2015 - 2019 Isaac Muse <isaacmuse@gmail.com>
 """
 import sys
 

docs/src/markdown/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.2
+
+- **FIX**: Fix compatibility issues with latest Regex versions.
+
 ## 4.0.1
 
 - **FIX**: Ensure that when generating the Unicode property tables, that the property files are read in with `UTF-8` encoding.

docs/src/markdown/license.md

@@ -2,7 +2,7 @@
 
 MIT license.
 
-Copyright (c) 2015 - 2018 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2015 - 2019 Isaac Muse <isaacmuse@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

mkdocs.yml

@@ -4,7 +4,7 @@ repo_url: https://github.com/facelessuser/backrefs
 edit_uri: tree/master/docs/src/markdown
 site_description: A library to add additional back references to regular expressions.
 copyright: |
-  Copyright &copy; 2015 - 2018 <a href="https://github.com/facelessuser">Isaac Muse</a>
+  Copyright &copy; 2015 - 2019 <a href="https://github.com/facelessuser">Isaac Muse</a>
   <br><span class="md-footer-custom-text">emoji provided free by </span><a href="http://www.emojione.com">EmojiOne</a>
 
 docs_dir: docs/src/markdown

tests/test_bregex.py

@@ -6,9 +6,12 @@
 from backrefs import _bregex_parse
 import regex
 import pytest
-import _regex_core
 import random
 import copy
+try:
+    import _regex_core
+except ImportError:
+    from regex import _regex_core
 
 
 class TestSearchTemplate(unittest.TestCase):
@@ -101,6 +104,11 @@ def test_posix_property_bad_syntax(self):
     def test_cache(self):
         """Test cache."""
 
+        try:
+            from regex import _cache
+        except ImportError:
+            from regex.regex import _cache
+
         bregex.purge()
         self.assertEqual(bregex._get_cache_size(), 0)
         self.assertEqual(bregex._get_cache_size(True), 0)
@@ -115,7 +123,7 @@ def test_cache(self):
         bregex.purge()
         self.assertEqual(bregex._get_cache_size(), 0)
         self.assertEqual(bregex._get_cache_size(True), 0)
-        self.assertEqual(len(regex._cache), 0)
+        self.assertEqual(len(_cache), 0)
 
     def test_infinite_loop_catch(self):
         """Test infinite loop catch."""