Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit77cd665

Browse files
committed
Renamed modules utils to util, and errors to exc to be more conforming to the submodules's naming conventions
1 parent791765c commit77cd665

File tree

22 files changed

+35
-31
lines changed

22 files changed

+35
-31
lines changed

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ CHANGES
1717
They may only be initialized using their binary shas, reference names or revision specs are not allowed anymore.
1818
* The .data attribute was removed from the Object type, it is only available
1919
on the Blob type.
20+
* For consistency with naming conventions used in sub-modules like gitdb, the following modules have been renamed
21+
* git.utils -> git.util
22+
* git.errors -> git.exc
23+
* git.objects.utils -> git.objects.util
2024

2125

2226
0.2 Beta 2

‎lib/git/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ def _init_externals():
2828
fromgit.objectsimport*
2929
fromgit.refsimport*
3030
fromgit.diffimport*
31-
fromgit.errorsimport*
31+
fromgit.excimport*
3232
fromgit.cmdimportGit
3333
fromgit.repoimportRepo
3434
fromgit.remoteimport*
3535
fromgit.indeximport*
36-
fromgit.utilsimport (
36+
fromgit.utilimport (
3737
LockFile,
3838
BlockingLockFile,
3939
Stats

‎lib/git/cmd.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
66

77
importos,sys
8-
fromutilsimport*
9-
fromerrorsimportGitCommandError
8+
fromutilimport*
9+
fromexcimportGitCommandError
1010

1111
fromsubprocessimport (
1212
call,

‎lib/git/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
importcStringIO
1414

1515
fromgit.odictimportOrderedDict
16-
fromgit.utilsimportLockFile
16+
fromgit.utilimportLockFile
1717

1818
__all__= ('GitConfigParser', )
1919

‎lib/git/diff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
importre
88
fromobjects.blobimportBlob
9-
fromobjects.utilsimportmode_str_to_int
10-
fromerrorsimportGitCommandError
9+
fromobjects.utilimportmode_str_to_int
10+
fromexcimportGitCommandError
1111

1212
fromgitdb.utilimporthex_to_bin
1313

File renamed without changes.

‎lib/git/index/base.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
importgit.objects
3737
importgit.diffasdiff
3838

39-
fromgit.errorsimport (
39+
fromgit.excimport (
4040
GitCommandError,
4141
CheckoutError
4242
)
@@ -48,9 +48,9 @@
4848
Commit,
4949
)
5050

51-
fromgit.objects.utilsimportSerializable
51+
fromgit.objects.utilimportSerializable
5252

53-
fromgit.utilsimport (
53+
fromgit.utilimport (
5454
IndexFileSHA1Writer,
5555
LazyMixin,
5656
LockedFD,

‎lib/git/index/fun.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
fromstatimportS_IFDIR
66
fromcStringIOimportStringIO
77

8-
fromgit.utilsimportIndexFileSHA1Writer
9-
fromgit.errorsimportUnmergedEntriesError
8+
fromgit.utilimportIndexFileSHA1Writer
9+
fromgit.excimportUnmergedEntriesError
1010
fromgit.objects.funimport (
1111
tree_to_stream,
1212
traverse_tree_recursive,

‎lib/git/objects/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
fromtreeimport*
99
fromcommitimport*
1010
fromsubmoduleimport*
11-
fromutilsimportActor
11+
fromutilimportActor
1212

1313
__all__= [nameforname,objinlocals().items()
1414
ifnot (name.startswith('_')orinspect.ismodule(obj)) ]

‎lib/git/objects/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44
# This module is part of GitPython and is released under
55
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
6-
fromgit.utilsimportLazyMixin,join_path_native,stream_copy
7-
fromutilsimportget_object_type_by_name
6+
fromgit.utilimportLazyMixin,join_path_native,stream_copy
7+
fromutilimportget_object_type_by_name
88
fromgitdb.utilimport (
99
hex_to_bin,
1010
bin_to_hex,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2026 Movatter.jp