rename core.modules.json_new -> core.modules.json and core.modules.xm…

…l_clean -> core.modules.xml

I think initially it was like this because I was running it like  `bleanser/core/modules/xml.py prune ...`

This would implicitly add src/bleanser/core to PYTHONPATH, and if you have any modules conflicting with builtin modules, it would shadow them (like xml or json), and result in all sorts of trouble (e.g. segfaults).

Running as `python3 -m bleanser.core.modules.xml prune ...` is much cleaner anyway and results in less trouble in other aspects as well, so let's just do that and rename the core modules for the ease of discovery

README.md

@@ -71,7 +71,7 @@ if __name__ == "__main__":
 
 This is **always** acting on the data loaded into memory/temporary files, it is not modifying the files itself. Once it determines an input file can be pruned, it will warn you by default, and you can specify `--move` or `--remove` with the CLI (see below) to remove it.
 
-There are particular normalisers for different filetypes, e.g. [`json`](./src/bleanser/core/modules/json_new.py), [`xml`](./src/bleanser/core/modules/xml_clean.py), [`sqlite`](./src/bleanser/core/modules/sqlite.py) which might work if your data is especially basic, but typically this requires subclassing one of those and writing some custom code to 'cleanup' the data, so it can be properly compared/diffed.
+There are particular normalisers for different filetypes, e.g. [`json`](./src/bleanser/core/modules.json.py), [`xml`](./src/bleanser/core/modules/xml_clean.py), [`sqlite`](./src/bleanser/core/modules/sqlite.py) which might work if your data is especially basic, but typically this requires subclassing one of those and writing some custom code to 'cleanup' the data, so it can be properly compared/diffed.
 
 ### do_cleanup
 
@@ -117,7 +117,7 @@ As it can be a bit difficult to follow, generally this is doing something like.
 For example, the JSON normaliser calls a `cleanup` function before it starts processing the data. If you wanted to remove the `images` key like shown above, you could do so like:
 
 ```python
-from bleanser.core.modules.json_new import JsonNormaliser, delkeys, Json
+from bleanser.core.modules.json import JsonNormaliser, delkeys, Json
 
 
 class Normaliser(JsonNormaliser):
@@ -136,8 +136,8 @@ if __name__ == '__main__':
 For common formats, the helper classes handle all the tedious bits like loading/parsing data, managing the temporary files. The `Normaliser.main` calls the CLI, which looks like this:
 
 ```
- $ python3 -m bleanser.core.modules.json_new prune --help
-Usage: python -m bleanser.core.modules.json_new prune [OPTIONS] PATH
+ $ python3 -m bleanser.core.modules.json prune --help
+Usage: python -m bleanser.core.modules.json prune [OPTIONS] PATH
 
 Options:
   --glob                 Treat the path as glob (in the glob.glob sense)

src/bleanser/core/modules/xml_clean.py → src/bleanser/core/modules/xml.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python3
-"""
-Ugh, wtf?? If I name it simply 'xml', I get all sorts of weird behaviours... presumably because it conflicts with some system modules..
-"""
-
 from lxml import etree
 
 from contextlib import contextmanager

src/bleanser/modules/bumble_android.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 from bleanser.core.modules.sqlite import SqliteNormaliser, Tool
-from bleanser.core.modules.json_new import delkeys
+from bleanser.core.modules.json import delkeys
 
 import json
 

src/bleanser/modules/foursquare.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 TARGET = object()

src/bleanser/modules/ghexport.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json
+from bleanser.core.modules.json import JsonNormaliser, Json
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/goodreads.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.xml_clean import Normaliser as XmlNormaliser
+from bleanser.core.modules.xml import Normaliser as XmlNormaliser
 
 
 class Normaliser(XmlNormaliser):

src/bleanser/modules/instagram_android.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import delkeys, patch_atoms
+from bleanser.core.modules.json import delkeys, patch_atoms
 from bleanser.core.modules.sqlite import SqliteNormaliser, Tool
 
 import json

src/bleanser/modules/json_new.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import *  # noqa: F403, F401
+from bleanser.core.modules.json import *  # noqa: F403, F401
 
 import warnings
-warnings.warn("Module 'bleanser.modules.json_new' is deprecated. Use 'bleanser.core.modules.json_new' instead.", DeprecationWarning)
+warnings.warn("Module 'bleanser.modules.json_new' is deprecated. Use 'bleanser.core.modules.json' instead.", DeprecationWarning)
 
 
 if __name__ == '__main__':

src/bleanser/modules/lastfm.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json
+from bleanser.core.modules.json import JsonNormaliser, Json
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/monzo.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/pinboard.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser
+from bleanser.core.modules.json import JsonNormaliser
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/pocket.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/reddit.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from itertools import chain
 
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 REDDIT_IGNORE_KEYS = {

src/bleanser/modules/rescuetime.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser
+from bleanser.core.modules.json import JsonNormaliser
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/skype_android.py

@@ -2,7 +2,7 @@
 import json
 
 from bleanser.core.modules.sqlite import SqliteNormaliser, Tool
-from bleanser.core.modules.json_new import delkeys
+from bleanser.core.modules.json import delkeys
 
 
 class Normaliser(SqliteNormaliser):

src/bleanser/modules/smscalls.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.xml_clean import Normaliser as XmlNormaliser
+from bleanser.core.modules.xml import Normaliser as XmlNormaliser
 
 
 class Normaliser(XmlNormaliser):

src/bleanser/modules/spotify.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/spotifyexport.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, delkeys, Json
+from bleanser.core.modules.json import JsonNormaliser, delkeys, Json
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/stackexchange.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from bleanser.core.modules.json_new import JsonNormaliser, Json, delkeys
+from bleanser.core.modules.json import JsonNormaliser, Json, delkeys
 
 
 class Normaliser(JsonNormaliser):

src/bleanser/modules/xml_clean.py

@@ -1,4 +1,4 @@
-from bleanser.core.modules.xml_clean import *  # noqa: F401, F403
+from bleanser.core.modules.xml import *  # noqa: F401, F403
 
 import warnings
 warnings.warn("Module 'bleanser.modules.xml_clean' is deprecated. Use 'bleanser.core.modules.xml_clean' instead.", DeprecationWarning)

src/bleanser/tests/test_hypothesis.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from bleanser.core.modules.json_new import JsonNormaliser as Normaliser
+from bleanser.core.modules.json import JsonNormaliser as Normaliser
 
 from bleanser.tests.common import TESTDATA, actions, hack_attribute