Abbreviating package to pkg makes it sound like it's going in a field named

groves · groves · commit 903b704de384 · 2008-12-31T21:36:03.000Z
pkg.
diff --git a/src/org/python/core/ClasspathPyImporter.java b/src/org/python/core/ClasspathPyImporter.java
@@ -110,7 +110,7 @@ protected String makeFilename(String fullname) {
     }
 
     @Override
-    protected String makePkgPath(String fullname) {
+    protected String makePackagePath(String fullname) {
         return path;
     }
 
diff --git a/src/org/python/core/util/importer.java b/src/org/python/core/util/importer.java
@@ -46,7 +46,7 @@ public importer() {
      * Returns the value to fill in __path__ on a module with the given full module name created by
      * this importer.
      */
-    protected abstract String makePkgPath(String fullname);
+    protected abstract String makePackagePath(String fullname);
 
     /**
      * Given a full module name, return the potential file path in the archive (without extension).
@@ -95,7 +95,7 @@ protected final PyObject importer_load_module(String fullname) {
         if (moduleCodeData.ispackage) {
             // add __path__ to the module *before* the code gets executed
             PyList pkgpath = new PyList();
-            pkgpath.add(makePkgPath(fullname));
+            pkgpath.add(makePackagePath(fullname));
             mod.__dict__.__setitem__("__path__", pkgpath);
         }
         imp.createFromCode(fullname, moduleCodeData.code, moduleCodeData.path);
@@ -155,7 +155,7 @@ protected final ModuleInfo getModuleInfo(String fullname) {
      */
     protected final ModuleCodeData getModuleCode(String fullname) {
         String path = makeFilename(fullname);
-        String fullPath = makePkgPath(fullname);
+        String fullPath = makePackagePath(fullname);
 
         if (path.length() < 0) {
             return null;
diff --git a/src/org/python/modules/zipimport/zipimporter.java b/src/org/python/modules/zipimport/zipimporter.java
@@ -418,7 +418,7 @@ protected String makeFilename(String fullname) {
     }
 
     @Override
-    protected String makePkgPath(String fullname) {
+    protected String makePackagePath(String fullname) {
         return archive + File.separator + prefix + getSubname(fullname);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ protected String makeFilename(String fullname) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
`113`		`- protected String makePkgPath(String fullname) {`
	`113`	`+ protected String makePackagePath(String fullname) {`
`114`	`114`	`return path;`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ protected String makeFilename(String fullname) {`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`@Override`
`421`		`- protected String makePkgPath(String fullname) {`
	`421`	`+ protected String makePackagePath(String fullname) {`
`422`	`422`	`return archive + File.separator + prefix + getSubname(fullname);`
`423`	`423`	`}`
`424`	`424`