Package to move functions and their import statements between files
Project description
mvdef
Summary
Move function definitions from one file to another, moving or copying associated import statements along with them.
New features
- 0.6.0 — functions can now move into a specified path in the destination file (e.g. to become a class method of a particular class, or an inner function of a particular funcdef)
- 0.5.13 — inner functions can now be moved into the global scope,
by specifying a path in
-mseparated by:(e.g.mvdef -m foo:bar a.py b.py)
Installation
To get mvdef on your command line, install from PyPi
pip install mvdef
Usage
usage: mvdef [-h] [-m MV] [-i INTO] [-v] [-b] [-d] src dst
Move function definitions and associated import statements from one file to another within a
library.
positional arguments:
src
dst
optional arguments:
-h, --help show this help message and exit
-m MV, --mv MV
-i INTO, --into INTO
-v, --verbose
-b, --backup
-d, --dry-run
- For development flags not shown above (
--debug,--show-tracebacks,--demo) see [below](#Development flags)
Example usage
A simple move
mvdef -m myfunc source.py destination.py -vb
will move the global funcdef named myfunc from source.py to destination.py,
while verbosely reporting results (-v) and making backups (-b).
- Further functions can be moved by adding more
-m/--mvflags each followed by a function name, e.g.mvdef -m a -m b -m c...- (The
-m/--mvflags can go anywhere but I find it more natural to place them first, so the command reads "move {this function} from {this file} to {this file}")
- (The
A simple move with a specified target
mvdef -m foo -i Bar src.py dst.py
will move the funcdef named foo from the global namespace of src.py into the
class definition Bar (where it becomes a method) of dst.py,
(silently this time, and without backups, neither of which should be necessary).
- The
-i/--intoflags must come immediately following the-m/--mvflag they "pair" with (i.e. whose funcdef insrc.pythey provide a target for indst.py)
Multiple moves
mvdef -m hello -i Bar.foo -m baz -i Bax src.py dst.py
will move the funcdef named hello from the global namespace of
Coming soon
Paths to -mv/--mv and -i/--into will soon support:
- wildcards: to avoid having to specify a full path to a particular function
- e.g.
-m **foo
- e.g.
- decorators: to indicate a particular version of funcdefs with identical names
- e.g. for
propertydecorators which have a@propertyand a@foo.settervariant
- e.g. for
Moving with imports: a simple case study
Consider the file hello.py:
from pprint import pprint
def hello():
pprint("hi")
To move the hello funcdef to the blank file world.py, we run:
mvdef -m hello hello.py world.py -v
⇣
--------------RUNNING mvdef.cli⠶main()--------------
• Determining edit agenda for hello.py:
⇢ MOVE ⇢ (import 0:0 on line 1) pprint ⇒ <pprint.pprint>
⇒ Functions moving from /home/ubuntu/stuff/simple_with_import_edit/hello.py: ['hello']
• Determining edit agenda for world.py:
⇢ TAKE ⇢ (import 0:0 on line 1) pprint ⇒ <pprint.pprint>
⇒ Functions will move to /home/ubuntu/stuff/simple_with_import_edit/world.py
------------------COMPLETE--------------------------
Development flags
--debug
When you want to debug why something works or why it didn't work, change the mvdef -m ...
command to python -im mvdef -m ... to gain an interactive shell after the command runs.
If you supply --debug at the end of this command, the variable link will be populated
with the FileLink instance which can be inspected and debugged (without need for pdb).
-show-tracebacks
By default, mvdef will curtail the stack trace when raising an error
(as robust interfaces are more user-friendly).
To print the full stack trace, add the --show-tracebacks flag (and submit errors you find
on GitHub).
--demo
To run a built-in demo, run mvdef --demo (equivalent to running the following within the
package source):
mvdef -m pprint_dict mvdef/example/demo_program.py mvdef/example/new_file.py -vd
- The function
pprint_dictis moved from the source file to the destination file, taking along import statements (or more precisely, taking individual aliases from import statements, which then form new import statements in the destination file). The top right of the image displays a report of the 'agenda' whichmvdeffollows, alias by alias, to carry out these changes. - This demo can be reproduced by running
python -im mvdef --demofrom the main directory upon cloning this repository, and inspecting the source file (demo_program.py) and destination file (new_file.py) undermvdef/example/. - This demo creates hidden
.backupfiles, which can be used to 'reset' the demo by moving them back so as to overwrite the original files.
mvdef --demo will display a (dry run) demo of the output from moving a function from
one file to another (in colour in the terminal, using ANSI codes):
--------------RUNNING mvdef.demo⠶main()--------------
{'foo': 1, 'bar': 2}
hello//human, welcome to spin.systems
✔ All tests pass
• Determining edit agenda for demo_program.py:
⇢ MOVE ⇢ (import 0:0 on line 1) ft ⇒ <functools>
⇢ MOVE ⇢ (import 1:0 on line 2) pprint ⇒ <pprint.pprint>
⇢ MOVE ⇢ (import 1:1 on line 2) pformat ⇒ <pprint.pformat>
⇠ KEEP ⇠ (import 3:1 on line 4) pathsep ⇒ <os.path.sep>
⇠ KEEP ⇠ (import 2:0 on line 3) req ⇒ <urllib.request>
✘ LOSE ✘ (import 3:0 on line 4) bname ⇒ <os.path.basename>
✘ LOSE ✘ (import 3:2 on line 4) islink ⇒ <os.path.islink>
⇒ Functions moving from /home/louis/dev/mvdef/src/mvdef/example/demo_program.py: ['pprint_dict']
• Determining edit agenda for new_file.py:
⇢ TAKE ⇢ (import 0:0 on line 1) ft ⇒ <functools>
⇢ TAKE ⇢ (import 1:0 on line 2) pprint ⇒ <pprint.pprint>
⇢ TAKE ⇢ (import 1:1 on line 2) pformat ⇒ <pprint.pformat>
⇒ Functions will move to /home/louis/dev/mvdef/src/mvdef/example/new_file.py
DRY RUN: No files have been modified, skipping tests.
------------------COMPLETE--------------------------
Demo usage
Motivation
My workflow typically involves a process of starting to work in one file, with one big function, and later breaking out that function into smaller functions once I've settled on the first draft of control flow organisation.
After 'breaking out' the code into multiple smaller functions in this way, it'll often be the case that some of the functions are thematically linked (e.g. they operate on the same type of variable or are connected in the workflow). In these cases, it's useful to move function definitions out of the main file, and into a module file together, then import their names back into the main file if or as needed.
- If I have two functions
AandB, and my file calculatesA() + B(), not only can I moveAandBinto some other module filemymodule, but I can put a wrapper functionCin it too, and reduce the number of names I importdef C(): ans = A() + B() return ans
both saving on the complexity in the main file, and giving 'more space' to focus onA,BandCseparate from the complexity of what's going on in the main file (which in turn makes theme-focused tasks like documentation more straightforward).
The problem comes from then having to do the mental calculation (and often old fashioned searching for library-imported names within the file) of whether the functions I am trying to move out into another file rely on names that came from import statements, and if so, whether there are other functions which also rely on the same imported names. If I guess and get it wrong, I may then have to run the code multiple times and inspect the error message tracebacks until I figure out the full set, or else just reset it to where I was if things get particularly messy, in which case the time spent trying to move functions and import statements manually was wasted.
All of this motivates a library which can handle such operations for me, not just because it requires some thought to do manually so much as that it's a waste of development time, and what's more it interrupts the train of thought (increasingly so as the software gets more complex, with more functions and libraries to consider).
Software can scale to handle these higher levels of complexity no differently than it can handle a simple case, and I began writing this on the basis that "if I'm going to figure it out for this one instance, I may as well code it for any instance going forward".
Approach
The idea is to run a command like mvdef src.py dst.py fn1 fn2 fn3 to do the following:
- Back up
src.pyanddst.py, assrc.py.backupanddst.py.backupin case it doesn't work- Function completed in
src.backup⠶backup()withdry_runparameter, called insrc.demo - I'd also like to add the option to rename functions, using a pattern or list to rename
as
-
src.renamenot yet implemented
-
- Function completed in
- Optional: Define some test that should pass after the refactor,
when
src.pyimportsfn1, fn2, fn3fromdst.py- Tests defined for all functions in
example.demo_programinexample.test⠶test_report, called in__main__- Tests are checked and raise a
RuntimeErrorif they fail at this stage (i.e. the whole process aborts before any files are modified or created)
- Tests are checked and raise a
- If not, it would just be a matter of testing this manually (i.e. not necessary to define test to use tool, but suggested best practice)
- Tests defined for all functions in
- Enumerate all import statements in
src.py(nodes in the AST of typeast.Import)src.ast_util⠶annotate_importsreturns this list, which gets assigned toimportsinsrc.ast_util⠶parse_mv_funcs
- Enumerate all function definitions in
src.py(nodes in the AST of typeast.FunctionDef)ast⠶parseprovides this as the.bodynodes which are of typeast.FunctionDef.- This subset of AST nodes is assigned to
defsinsrc.ast_util⠶ast_parse.
- This subset of AST nodes is assigned to
- Find the following subsets:
-
mvdefs: subset of all function definitions which are to be moved (fn1,fn2,fn3)- This subset is determined by cross-referencing the names of the
defs(from previous step) against themvdefs(list of functions to move, such as["fn1", "fn2", "fn3"]), in the dedicated functionsrc.ast_util⠶get_def_names, then returned bysrc.ast_tools⠶parse_mv_funcsas a list, assigned tomvdefsinsrc.ast_util⠶ast_parse.
- This subset is determined by cross-referencing the names of the
-
nonmvdefs: subset of all function definitions not to be moved (not inmvdefs)- This subset is determined by negative cross-ref. to names of the
defsagainst themvdefs(such as["fn4", "fn5", "fn6"]), again usingsrc.ast_util⠶get_def_names, then returned bysrc.ast_util⠶parse_mv_funcsas a list, assigned tononmvdefsinsrc.ast_util⠶ast_parse.
- This subset is determined by negative cross-ref. to names of the
-
mv_imports: Import statements used only by the functions inmvdefs -
nonmv_imports: Import statements used only by the functions innonmvdefs -
mutual_imports: Import statements used by both functions inmvdefsandnonmvdefs -
nondef_imports: Import statements not used by any function- Note that these may no longer be in use, but this can only be confirmed by checking outside of function definitions too.
- Potentially add this feature later, for now just report which imports aren't used.
-
- Handle the 3 types of imported names:
- Move the import statements in
mv_imports(received as "take") - Keep the import statements in
nonmvdef_imports - Copy the import statements in
mutual_imports(received as "echo")
- Move the import statements in
- ...and also:
- Handle moving one import name from an import statement importing multiple names (i.e. where you can't simply copy the line)
- Handle multi-line imports (i.e. where you can't simply find the names on one line)
- ...and remove unused import statements (neither in/outside any function definitions)
- ...and only then move the function definitions in
mvdefsacross - If tests were defined in step 2, check that these tests run
- For the demo, the tests are checked (by running
test_reporta 2nd time) aftersrc.demo⠶run_demohas returned a parsed version of the source and destination files (which will only matter once the parameternochangeis set toFalseinrun_demo, allowing it to propagate through the call tosrc.demo⠶parse_exampleinto a call tosrc.ast_util⠶ast_parse(..., edit=True)and ultimately carry out in-place editing of the source and/or destination file/s as required). - If they fail, ask to restore the backup and give the altered src/dst
.pyfiles.py.mvdef_fixsuffixes (i.e. always permit the user to exit gracefully with no further changes to files rather than forcing them to)
- For the demo, the tests are checked (by running
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distribution
Built Distribution
Filter files by name, interpreter, ABI, and platform.
If you're not sure about the file name format, learn more about wheel file names.
Copy a direct link to the current filters
File details
Details for the file mvdef-0.6.1.tar.gz.
File metadata
- Download URL: mvdef-0.6.1.tar.gz
- Upload date:
- Size: 391.1 kB
- Tags: Source
- Uploaded using Trusted Publishing? No
- Uploaded via: twine/3.2.0 pkginfo/1.6.1 requests/2.24.0 setuptools/50.3.2 requests-toolbelt/0.9.1 tqdm/4.51.0 CPython/3.8.6
File hashes
| Algorithm | Hash digest | |
|---|---|---|
| SHA256 |
474190eaa74dd7b54c689c337c756de9f42d53efe5e98e9ee6919f60614d9a88
|
|
| MD5 |
da231d5ba5524e7c8522fa39fc10beab
|
|
| BLAKE2b-256 |
f79dad7273412f2e5cc6a61a73ff4caeb330bccc5374f74063e6c31184b3bc0c
|
File details
Details for the file mvdef-0.6.1-py3-none-any.whl.
File metadata
- Download URL: mvdef-0.6.1-py3-none-any.whl
- Upload date:
- Size: 387.7 kB
- Tags: Python 3
- Uploaded using Trusted Publishing? No
- Uploaded via: twine/3.2.0 pkginfo/1.6.1 requests/2.24.0 setuptools/50.3.2 requests-toolbelt/0.9.1 tqdm/4.51.0 CPython/3.8.6
File hashes
| Algorithm | Hash digest | |
|---|---|---|
| SHA256 |
aa47058d4f74735c639507ba8250cadf72dea1c1f333d730a71fd827d70eee2c
|
|
| MD5 |
6a435d197d8d1a052c5c93f8ad75ed11
|
|
| BLAKE2b-256 |
cceac1dbb7d093e57dfcbd4de4c354750082b2cf9a8b2ec0c62544bdc697cf98
|